Merge pull request #13 from OOPMan/issue_12_device_support_request_ma…

…dcatz_te2_xbo

Issue 12 device support request madcatz te2 xbo

XBOFS.win.sln

@@ -11,7 +11,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
 	ProjectSection(SolutionItems) = preProject
 		.gitignore = .gitignore
 		_config.yml = _config.yml
-		CNAME = CNAME
 		LICENSE.txt = LICENSE.txt
 		pre-build.cmd = pre-build.cmd
 		README.md = README.md
@@ -29,6 +28,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "docs", "docs", "{B758C57A-D
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "presets", "presets", "{98CB9F55-4522-4F47-8C9F-79070A0C1464}"
 	ProjectSection(SolutionItems) = preProject
+		presets\madcatz_te2_zadig_preset.cfg = presets\madcatz_te2_zadig_preset.cfg
 		presets\razer_atrox_zadig_preset.cfg = presets\razer_atrox_zadig_preset.cfg
 	EndProjectSection
 EndProject

XBOFS.win/PDCursesUIManager.cpp

@@ -60,7 +60,7 @@ int PDCursesUIManager::checkMailbox()
 void PDCursesUIManager::render(bool exiting)
 {
     erase();
-    mvwprintw(this->window, 0, 0, "XBOFS.win v0.3 %s", exiting ? "" : "(Press Q to exit)");    
+    mvwprintw(this->window, 0, 0, "XBOFS.win v0.3a %s", exiting ? "" : "(Press Q to exit)");    
     mvwprintw(this->window, 2, 0, "WinUSB Device Manager (Thread ID %d) status: %s", this->winUsbDeviceManager->getThreadId(), threadMessageToString(this->winUsbDeviceManagerStatus).c_str());  
     auto counter = 0;            
     for (auto threadId : this->winUsbDeviceThreadIdList) {

XBOFS.win/WinUsbDeviceManager.cpp

@@ -67,7 +67,7 @@ std::set<tstring> WinUsbDeviceManager::retrieveDevicePaths() {
     this->logger->debug("Retrieving device interface paths");
     do {        
         configurationManagerResult = CM_Get_Device_Interface_List_Size(&deviceInterfaceListSize,
-            (LPGUID)&GUID_DEVINTERFACE_RazorAtroxWinUSBVigEmFeeder,
+            (LPGUID)&GUID_DEVINTERFACE_XBOFS_WIN_CONTROLLER,
             NULL,
             CM_GET_DEVICE_INTERFACE_LIST_PRESENT);              
 
@@ -87,7 +87,7 @@ std::set<tstring> WinUsbDeviceManager::retrieveDevicePaths() {
             break;
         }
 
-        configurationManagerResult = CM_Get_Device_Interface_List((LPGUID)&GUID_DEVINTERFACE_RazorAtroxWinUSBVigEmFeeder,
+        configurationManagerResult = CM_Get_Device_Interface_List((LPGUID)&GUID_DEVINTERFACE_XBOFS_WIN_CONTROLLER,
             NULL,
             deviceInterfaceList,
             deviceInterfaceListSize,

XBOFS.win/XBOFS.win.vcxproj.filters

@@ -45,9 +45,6 @@
     </ClInclude>
   </ItemGroup>
   <ItemGroup>
-    <ClCompile Include="device.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
     <ClCompile Include="main.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
@@ -69,6 +66,9 @@
     <ClCompile Include="utils.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="device.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <None Include="ReadMe.txt" />

XBOFS.win/device.cpp

@@ -171,7 +171,7 @@ Return value:
     //
     do {
         cr = CM_Get_Device_Interface_List_Size(&DeviceInterfaceListLength,
-                                               (LPGUID)&GUID_DEVINTERFACE_RazorAtroxWinUSBVigEmFeeder,
+                                               (LPGUID)&GUID_DEVINTERFACE_XBOFS_WIN_CONTROLLER,
                                                NULL,
                                                CM_GET_DEVICE_INTERFACE_LIST_PRESENT);
 
@@ -189,7 +189,7 @@ Return value:
             break;
         }
 
-        cr = CM_Get_Device_Interface_List((LPGUID)&GUID_DEVINTERFACE_RazorAtroxWinUSBVigEmFeeder,
+        cr = CM_Get_Device_Interface_List((LPGUID)&GUID_DEVINTERFACE_XBOFS_WIN_CONTROLLER,
                                           NULL,
                                           DeviceInterfaceList,
                                           DeviceInterfaceListLength,

XBOFS.win/device.h

@@ -10,7 +10,7 @@
 // Must match "DeviceInterfaceGUIDs" registry value specified in the INF file.
 //
 // 5ACF052A-3BE5-46AE-905E-356BA17671BD
-DEFINE_GUID(GUID_DEVINTERFACE_RazorAtroxWinUSBVigEmFeeder,
+DEFINE_GUID(GUID_DEVINTERFACE_XBOFS_WIN_CONTROLLER,
     0x5ACF052A, 0x3BE5, 0x46AE, 0x90, 0x5E, 0x35, 0x6B, 0xA1, 0x76, 0x71, 0xBD);
 
 typedef struct _DEVICE_DATA {

docs/index.md

@@ -2,6 +2,17 @@
 **XBOFS.win** allows you to use your **XBO Fight Stick** controller on Windows without having to install ancient, beta 
 drivers and rewire buttons
 
+# Features
+* All buttons on supported controllers work, no rewiring or fiddling required
+* Multiple supported controllers can be connected
+* Supported controllers work in Steam, Windows Store games, etc
+
+
+# Supported controllers
+* Razer Atrox XBO
+* Madcatz TE2 XBO
+
+
 ## Contents
 1. [Requirements](#requirements)
    1. [Supported controllers](#supported-controllers)
@@ -20,13 +31,17 @@ drivers and rewire buttons
 1. Windows 7 or newer
 2. 1 or more supported controllers
 
-##### Supported controllers
-1. Razer Atrox XBO
-
 
 ## Screenshots and Videos
 
-Coming Soon
+Initial program state when run:
+![](images/screenshots/01.jpg)
+Program state after a supported controller is connected:
+![](images/screenshots/02.jpg)
+Device manager displays the real connected controller as well as the virtual XB360 controller
+![](images/screenshots/03.jpg)
+Steam only sees the virtual XB360 controller
+![](images/screenshots/04.jpg)
 
 ## Installation
 
@@ -37,7 +52,8 @@ Coming Soon
     latest **XBOFS.win.zip** bundle. Extract this bundle somewhere. I recommend the root of your C: drive
 04. Browse to [https://zadig.akeo.ie](https://zadig.akeo.ie) and download **Zadig 2.4** to the *XBOFS.win* folder extracted in the previous step
 05. Open the [ZaDig WinUSB driver installation guide](/zadig.md) and follow the instructions there to install 
-    a **WinUSB** driver for your supported controller
+    a **WinUSB** driver for your supported controller. If you own multiple different supported controllers then you must repeat step 5
+    for each different supported controller
 
 
 ## Updating
@@ -108,7 +124,8 @@ In order to solve this issue you should reboot after upgrading **XBOFS.win**. If
 Please do one of the following:
 1. [Submit an issue](https://github.com/OOPMan/XBOFS.win/issues) on GitHub
 2. [Message](https://www.reddit.com/message/compose/?to=OOPManZA) me on Reddit
-3. Join the [Nefarius Software Solutions](https://discord.vigem.org/) Discord server and ping **@OOPMan**
+3. Join the XBOFS.win [subreddit](https://www.reddit.com/r/XBOFS/) and post a question
+4. Join the [Nefarius Software Solutions](https://discord.vigem.org/) Discord server and ping **@OOPMan**
 
 
 ## FAQ
@@ -118,7 +135,7 @@ Long story short, I bought a Razer Atrox on special and rather than return it I
 through a lot of hoops. The problemn ended up being solvable and here we are. More details can be found [here](https://forums.vigem.org/topic/282/xbo-arcade-sticks-vigem-and-a-whole-ton-of-fun/)
 
 ##### Can you support my device?
-It might be possible. Take a look at the [device contributor guide](/device_contributor_guide.md) to see how you can collect the data I need to do so...
+It's very likely. Take a look at the [device contributor guide](/device_contributor_guide.md) to see how you can collect the data I need to do so...
 
 ## Credits
 
@@ -142,4 +159,6 @@ It might be possible. Take a look at the [device contributor guide](/device_cont
 * **Testing**
   * Multiple Atrox support
     * [Manick74](https://www.reddit.com/user/Manick74)
-    * [TheDecn](https://www.reddit.com/user/TheDecn)
+    * [TheDecn](https://www.reddit.com/user/TheDecn)
+  * Madcatz TE2 XBO data collection
+    * [Fodenn](https://www.reddit.com/user/Fodenn)

docs/zadig.md

@@ -29,7 +29,7 @@
 09. Click the *Extract Files (Don't Install)* option
 
     ![Device Manager](images/zadig/09.jpg)
-10. ZaDig should now appear as follows. DO NOT click the *Extract Files* button yet!
+10. ZaDig should now appear as follows. **DO NOT** click the *Extract Files* button yet!
 
     ![Device Manager](images/zadig/10.jpg)
 11. Click *Options*. Click *Advanced Mode*
@@ -38,10 +38,10 @@
 12. Click the highlighted icon next to the *Extract Files* button
 
     ![Device Manager](images/zadig/12.jpg)
-13. Navigate to the *zadig_driver* folder and click *Select Folder*
+13. Navigate to the *zadig_driver*, click the folder for your controller and click *Select Folder*
 
     ![Device Manager](images/zadig/13.jpg)
-14. Confirm in the log area that **ZaDig** is going to use the *zadig_driver* folder as the extraction directory
+14. Confirm in the log area that **ZaDig** is going to use the selected folder as the extraction directory
 
     ![Device Manager](images/zadig/14.jpg)
 15. Now, finally, click the *Extract Files* button
@@ -51,7 +51,7 @@
     were successfully extracted. You can now close **ZaDig**
 
     ![Device Manager](images/zadig/16.jpg)
-17. Open the *zadig_driver* folder
+17. Open the correct folder within the *zadig_driver* folder
 
     ![Device Manager](images/zadig/17.jpg)
 18. Right-click on the *Setup information* file (The icon is a white page with a grey gear)