- Fix vendor_id/product_id mixup

- Max "calibrate" button non-default
This commit is contained in:
David Khachaturov 2020-11-15 13:47:59 +00:00
parent 57c1680537
commit c0b9240887
2 changed files with 10 additions and 9 deletions

View file

@ -44,7 +44,7 @@ namespace BetterJoyForCemu {
} }
public string Serialise() { 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 // TODO: try checking against interface number instead
if (!ContainsText(list_customControllers, enumerate.product_string) && !ContainsText(list_allControllers, enumerate.product_string)) { String name = enumerate.product_string + '(' + enumerate.vendor_id + '-' + enumerate.product_id + ')';
list_allControllers.Items.Add(new SController(enumerate.product_string, enumerate.vendor_id, enumerate.product_id, 0)); 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 // 0 type is undefined
} }

View file

@ -31,7 +31,7 @@
<!--Don't set this lower than 15 --> <!--Don't set this lower than 15 -->
<!-- Default: 200 --> <!-- Default: 200 -->
<add key="ShakeInputDelay" value="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.--> <!--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"--> <!--Also swaps buttons when using "Also use for buttons/axes"-->
<!--On is "true"; off is "false". Default: false --> <!--On is "true"; off is "false". Default: false -->
@ -44,9 +44,9 @@
<!--Allows for calibration of the controller's gyro. Adds a "Calibrate" button.--> <!--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 "true", click the "Calibrate" button once to get gyro calibrate data.-->
<!--When enabled, can only calibrate one controller at a time.--> <!--When enabled, can only calibrate one controller at a time.-->
<!--Default: true --> <!--Default: false -->
<add key="AllowCalibration" value="true" /> <add key="AllowCalibration" value="false" />
<!--Allows use of gyroscope tilting to get full control of the slider values (big triggers)--> <!--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)--> <!--Works on pro controller and joined joycons (pro controller case - triggers combined, joycons case - separate tilt)-->
<!--Default: false --> <!--Default: false -->
@ -76,7 +76,7 @@
<!-- Not case sensitive. --> <!-- Not case sensitive. -->
<!-- Default: Disabled --> <!-- Default: Disabled -->
<add key="NonOriginalController" value="Disabled" /> <add key="NonOriginalController" value="Disabled" />
<!-- The program will keep the HOME button LED ring light on at all times. --> <!-- The program will keep the HOME button LED ring light on at all times. -->
<!-- Default: true --> <!-- Default: true -->
<add key="HomeLEDOn" value="true"/> <add key="HomeLEDOn" value="true"/>
@ -101,7 +101,7 @@
<add key="DragToggle" value="false"/> <add key="DragToggle" value="false"/>
<!-- Determines whether or not the program will expose detected controllers as Xbox 360 controllers --> <!-- 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 --> <!-- Default: true -->
<add key="ShowAsXInput" value="true" /> <add key="ShowAsXInput" value="true" />
<!-- Have ShowAsXInput as false if using this --> <!-- Have ShowAsXInput as false if using this -->