Revision 34:cac1e8336448, committed 2015-06-24

Comitter:

sayzyas

Date:

Wed Jun 24 06:57:55 2015 +0000

Parent:

33:86c22c0c8aae

Child:

35:b5881939796b

Commit message:

20150624

Changed in this revision

--- a/USBHostHID/USBHostGamepad.cpp	Thu Jun 18 08:05:23 2015 +0000
+++ b/USBHostHID/USBHostGamepad.cpp	Wed Jun 24 06:57:55 2015 +0000
@@ -86,7 +86,11 @@
                 if (!int_in)
                     break;
 
-                USB_INFO("New Gamepad/Joystick device: VID:%04x PID:%04x [dev: %p - intf: %d]", dev->getVid(), dev->getPid(), dev, gamepad_intf);
+                gamePad_VID = dev->getVid();
+                gamePad_PID = dev->getPid();
+                
+             //   USB_INFO("New Gamepad/Joystick device: VID:%04x PID:%04x [dev: %p - intf: %d]", dev->getVid(), dev->getPid(), dev, gamepad_intf);
+                USB_INFO("New Gamepad/Joystick device: VID:%04x PID:%04x [dev: %p - intf: %d]", gamePad_VID, gamePad_PID, dev, gamepad_intf);
 #if DEBUG > 3
                 //Parse HID Report Descriptor
                 parseHidDescr();
@@ -115,8 +119,9 @@
 //    printf("GamePad Length=%dyryn", len_listen);
 #if DEBUG > 3
     USB_DBG("USBHostGamepad::rxHandler() len_listen=%d\r\n", len_listen);
-      for (int i = 0; i < len_listen; i++)
+      for (int i = 0; i < len_listen; i++){
           printf("%02X ", report[i]);
+      }
       printf("\r\n\r\n");
 #endif
     if (onUpdate) {
@@ -137,7 +142,10 @@
             report[12],
             report[13],
             report[14],
-            report[15]
+            report[15],
+            dev->getVid(),
+            dev->getPid()
+            
         );
     }
 
@@ -162,6 +170,9 @@
       btn13 = report[13];
       btn14 = report[14];
       btn15 = report[15];
+      
+ //     gamePad_VID = dev->getVid();
+ //     gamePad_PID = dev->getPid();      
 
     if (len_listen > sizeof(report)) {
         len_listen = sizeof(report);

--- a/USBHostHID/USBHostGamepad.h	Thu Jun 18 08:05:23 2015 +0000
+++ b/USBHostHID/USBHostGamepad.h	Wed Jun 24 06:57:55 2015 +0000
@@ -68,7 +68,7 @@
      * @param ptr function pointer
      */
 //    inline void attachEvent(void (*ptr)(uint8_t btnX, uint8_t btnY, uint8_t btnABCD, uint8_t btnSpecial)) {
-    inline void attachEvent(void (*ptr)(uint8_t btn00, uint8_t btn01, uint8_t btn02, uint8_t btn03, uint8_t btn04, uint8_t btn05, uint8_t btn06, uint8_t btn07, uint8_t btn08, uint8_t btn09, uint8_t btn10, uint8_t btn11, uint8_t btn12, uint8_t btn13, uint8_t btn14, uint8_t btn15)) {
+    inline void attachEvent(void (*ptr)(uint8_t btn00, uint8_t btn01, uint8_t btn02, uint8_t btn03, uint8_t btn04, uint8_t btn05, uint8_t btn06, uint8_t btn07, uint8_t btn08, uint8_t btn09, uint8_t btn10, uint8_t btn11, uint8_t btn12, uint8_t btn13, uint8_t btn14, uint8_t btn15, uint16_t gamePadVID, uint16_t gamePadPID)) {
         if (ptr != NULL) {
             onUpdate = ptr;
         }
@@ -96,6 +96,9 @@
     USBEndpoint * int_in;
 //    uint8_t report[8];
     uint8_t report[16];
+    
+    uint16_t    gamePad_VID;
+    uint16_t    gamePad_PID;
 
     bool dev_connected;
     bool gamepad_device_found;
@@ -126,7 +129,7 @@
 
     void rxHandler();
 //    void (*onUpdate)(uint8_t btnX, uint8_t btnY, uint8_t btnABCD, uint8_t btnSpecial);
-    void (*onUpdate)(uint8_t btn00, uint8_t btn01, uint8_t btn02, uint8_t btn03, uint8_t btn04, uint8_t btn05, uint8_t btn06, uint8_t btn07, uint8_t btn08, uint8_t btn09, uint8_t btn10, uint8_t btn11, uint8_t btn12, uint8_t btn13,uint8_t btn14,uint8_t btn15 );
+    void (*onUpdate)(uint8_t btn00, uint8_t btn01, uint8_t btn02, uint8_t btn03, uint8_t btn04, uint8_t btn05, uint8_t btn06, uint8_t btn07, uint8_t btn08, uint8_t btn09, uint8_t btn10, uint8_t btn11, uint8_t btn12, uint8_t btn13,uint8_t btn14,uint8_t btn15, uint16_t gamePadVID, uint16_t gamePadPID );
     
     int report_id;
     void init();