added VID=0x0738 PID=0x4738

Ryzee119 · Oct 24, 2019 · d1f2b4c · d1f2b4c
1 parent 426220b
commit d1f2b4c
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 17 deletions.
diff --git a/Firmware/ogx360_32u4/.vs/ogx360_32u4/v14/.atsuo b/Firmware/ogx360_32u4/.vs/ogx360_32u4/v14/.atsuo
diff --git a/Firmware/ogx360_32u4/ogx360_32u4/include/libraries/USB Host Shield/XBOXUSB.h b/Firmware/ogx360_32u4/ogx360_32u4/include/libraries/USB Host Shield/XBOXUSB.h
@@ -35,6 +35,7 @@
 #define MADCATZ_VID                             0x1BAD // For unofficial Mad Catz controllers
 #define JOYTECH_VID                             0x162E // For unofficial Joytech controllers
 #define GAMESTOP_VID                            0x0E6F // Gamestop controller
+#define MADCATZ_VID1                            0x0738 // Gamestop controller
 
 #define XBOX_WIRED_PID                          0x028E // Microsoft 360 Wired controller
 #define XBOX_WIRELESS_PID                       0x028F // Wireless controller only support charging
@@ -45,6 +46,7 @@
 #define JOYTECH_WIRED_PID                       0xBEEF // For Joytech wired controller
 #define GAMESTOP_WIRED_PID                      0x0401 // Gamestop wired controller
 #define AFTERGLOW_WIRED_PID                     0x0213 // Afterglow wired controller - it uses the same VID as a Gamestop controller
+#define MADCATZ_PID1                            0x4738 // Street Fighter IV FightStick TE
 
 #define XBOX_REPORT_BUFFER_SIZE 14 // Size of the input report buffer
 

diff --git a/Firmware/ogx360_32u4/ogx360_32u4/ogx360_32u4.componentinfo.xml b/Firmware/ogx360_32u4/ogx360_32u4/ogx360_32u4.componentinfo.xml
diff --git a/Firmware/ogx360_32u4/ogx360_32u4/src/libraries/USB Host Shield/XBOXUSB.cpp b/Firmware/ogx360_32u4/ogx360_32u4/src/libraries/USB Host Shield/XBOXUSB.cpp
@@ -94,20 +94,10 @@ uint8_t XBOXUSB::Init(uint8_t parent, uint8_t port, bool lowspeed) {
         VID = udd->idVendor;
         PID = udd->idProduct;
 
-        if(VID != XBOX_VID && VID != MADCATZ_VID && VID != JOYTECH_VID && VID != GAMESTOP_VID) // Check VID
+        if(VID != XBOX_VID && VID != MADCATZ_VID && VID != JOYTECH_VID && VID != GAMESTOP_VID && VID != MADCATZ_VID1)
                 goto FailUnknownDevice;
-        if(PID == XBOX_WIRELESS_PID) {
-#ifdef DEBUG_USB_HOST
-                Notify(PSTR("\r\nYou have plugged in a wireless Xbox 360 controller - it doesn't support USB communication"), 0x80);
-#endif
-                goto FailUnknownDevice;
-        } else if(PID == XBOX_WIRELESS_RECEIVER_PID || PID == XBOX_WIRELESS_RECEIVER_THIRD_PARTY_PID) {
-#ifdef DEBUG_USB_HOST
-                Notify(PSTR("\r\nThis library only supports Xbox 360 controllers via USB"), 0x80);
-#endif
-                goto FailUnknownDevice;
-        } else if(PID != XBOX_WIRED_PID && PID != MADCATZ_WIRED_PID && PID != GAMESTOP_WIRED_PID && PID != AFTERGLOW_WIRED_PID && PID != JOYTECH_WIRED_PID
-                  && PID!= MADCATZ_FIGHTSTICK_PID) // Check PID
+        if(PID != XBOX_WIRED_PID && PID != MADCATZ_WIRED_PID && PID != GAMESTOP_WIRED_PID &&
+				   PID != AFTERGLOW_WIRED_PID && PID != JOYTECH_WIRED_PID && PID!= MADCATZ_FIGHTSTICK_PID && PID!= MADCATZ_PID1)
                 goto FailUnknownDevice;
 
         // Allocate new address according to device class