From c0b9240887497e9c725cecf16570352d690b0606 Mon Sep 17 00:00:00 2001
From: David Khachaturov <d77777k@gmail.com>
Date: Sun, 15 Nov 2020 13:47:59 +0000
Subject: [PATCH]  - Fix vendor_id/product_id mixup  - Max "calibrate" button
 non-default

---
 BetterJoyForCemu/3rdPartyControllers.cs |  7 ++++---
 BetterJoyForCemu/App.config             | 12 ++++++------
 2 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/BetterJoyForCemu/3rdPartyControllers.cs b/BetterJoyForCemu/3rdPartyControllers.cs
index 033a625..256aa09 100644
--- a/BetterJoyForCemu/3rdPartyControllers.cs
+++ b/BetterJoyForCemu/3rdPartyControllers.cs
@@ -44,7 +44,7 @@ namespace BetterJoyForCemu {
             }
 
             public string Serialise() {
-                return String.Format("{0}|{1}|{2}|{3}", name, product_id, vendor_id, type);
+                return String.Format("{0}|{1}|{2}|{3}", name, vendor_id, product_id, type);
             }
         }
 
@@ -112,8 +112,9 @@ namespace BetterJoyForCemu {
                 }
 
                 // TODO: try checking against interface number instead
-                if (!ContainsText(list_customControllers, enumerate.product_string) && !ContainsText(list_allControllers, enumerate.product_string)) {
-                    list_allControllers.Items.Add(new SController(enumerate.product_string, enumerate.vendor_id, enumerate.product_id, 0));
+                String name = enumerate.product_string + '(' + enumerate.vendor_id + '-' + enumerate.product_id + ')';
+                if (!ContainsText(list_customControllers, name) && !ContainsText(list_allControllers, name)) {
+                    list_allControllers.Items.Add(new SController(name, enumerate.vendor_id, enumerate.product_id, 0));
                     // 0 type is undefined
                 }
 
diff --git a/BetterJoyForCemu/App.config b/BetterJoyForCemu/App.config
index de2fce0..27538f9 100644
--- a/BetterJoyForCemu/App.config
+++ b/BetterJoyForCemu/App.config
@@ -31,7 +31,7 @@
         <!--Don't set this lower than 15 -->
         <!-- Default: 200 -->
         <add key="ShakeInputDelay" value="200" />
-        
+
         <!--Swap A-B buttons; if on, this mimicks the (half of) Xbox layout by the button name, rather than by the physical layout.-->
         <!--Also swaps buttons when using "Also use for buttons/axes"-->
         <!--On is "true"; off is "false". Default: false -->
@@ -44,9 +44,9 @@
         <!--Allows for calibration of the controller's gyro. Adds a "Calibrate" button.-->
         <!--When "true", click the "Calibrate" button once to get gyro calibrate data.-->
         <!--When enabled, can only calibrate one controller at a time.-->
-        <!--Default: true -->
-        <add key="AllowCalibration" value="true" />
-        
+        <!--Default: false -->
+        <add key="AllowCalibration" value="false" />
+
         <!--Allows use of gyroscope tilting to get full control of the slider values (big triggers)-->
         <!--Works on pro controller and joined joycons (pro controller case - triggers combined, joycons case - separate tilt)-->
         <!--Default: false -->
@@ -76,7 +76,7 @@
         <!-- Not case sensitive. -->
         <!-- Default: Disabled -->
         <add key="NonOriginalController" value="Disabled" />
-      
+
         <!-- The program will keep the HOME button LED ring light on at all times. -->
         <!-- Default: true -->
         <add key="HomeLEDOn" value="true"/>
@@ -101,7 +101,7 @@
         <add key="DragToggle" value="false"/>
 
         <!-- Determines whether or not the program will expose detected controllers as Xbox 360 controllers -->
-        <!-- When "false", BetterJoy is only usable with CEMU. -->
+        <!-- When "false", BetterJoy is only usable with programs that support UDPServer. -->
         <!-- Default: true -->
         <add key="ShowAsXInput" value="true" />
         <!-- Have ShowAsXInput as false if using this -->