Update V7.1

BetterJoyForCemu/App.config

@@ -46,6 +46,13 @@
         <!--When enabled, can only calibrate one controller at a time.-->
         <!--Default: false -->
         <add key="允许手柄校准" value="false" />
+        <!-- Default calibration; used for third party controller -->
+        <add key="加速度传感器灵敏度" value="16384,16384,16384"/>
+        <add key="陀螺仪敏感度" value="18642,18642,18642"/>
+        <add key="摇杆1校准" value="0x780,0x780,0x780,0x830,0x780,0x780"/>
+        <add key="死区1" value="200"/>
+        <add key="摇杆2校准" value="0x780,0x780,0x780,0x830,0x780,0x780"/>
+        <add key="死区2" value="200"/>
 
         <!--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)-->
@@ -68,32 +75,35 @@
         <!-- Default: false -->
         <add key="使用HIDG" value="false" />
 
-        <!-- Determines whether or not to enable (experimental - currently default controller to pro) support for 3rd-party controllers. -->
-        <!-- Can be set to: Disabled, DefaultCalibration, ControllerCalibration -->
-        <!-- Disabled => Disables support for 3rd-party controllers. Uses joystick calibration data from the controller. -->
-        <!-- DefaultCalibration => Enables support for 3rd-party controllers. Uses hard coded joystick calibration data. -->
-        <!-- ControllerCalibration => Enables support for 3rd-party controllers. Uses joystick calibration data from the controller. -->
-        <!-- Not case sensitive. -->
-        <!-- Default: Disabled -->
-        <add key="非原装手柄支持" value="Disabled" />
-
         <!-- The program will keep the HOME button LED ring light on at all times. -->
         <!-- Default: true -->
         <add key="开启Home键LED灯" value="true"/>
-
         <!-- Will use multiple lights to display the current player rather than a single LED-->
-        <add key="Joycon使用渐进灯光" value="true" />
+        <add key="使用渐进灯光" value="true" />
 
         <!-- Determines whether or not to translate gyro movements into joystick ("joy") or mouse movement ("mouse"), or have no effect ("none") -->
-        <!-- When "joy", turn gyro movements into joystick movement (left/right depends on setting) [not yet implemented]-->
+        <!-- When "joy_left" or "joy_right", turn gyro movements into respective left/right joystick (mouse-like) movements -->
         <!-- When "mouse", turn gyro movements into mouse movement. Press either stick-button to reset to middle of primary display  -->
         <!-- Default: none -->
         <add key="陀螺仪使用Joycons或鼠标" value="none"/>
+        <!-- Whether to use filtered IMU or raw gyro values (the latter is more responsive) -->
+        <!-- Default: true -->
+        <add key="使用过滤的IMU" value="true"/>
+        <!-- Beta value of AHRS. Affects divergence of filter -->
+        <!-- Default: 0.05 -->
+        <add key="AHRS_beta" value="0.05"/>
         <!-- Sensitivity of gyro-to-mouse movements -->
-        <!-- Default: 1200; 800 -->
+        <!-- Default: 1200; 800 (if using raw values, decrease by a factor of ~15) -->
         <add key="鼠标模拟陀螺仪敏感度X轴" value="1200"/>
         <add key="鼠标模拟陀螺仪敏感度Y轴" value="800"/>
-        <!-- Gyro Hold/Toggle activation -->
+        <!-- Sensitivity of gyro-to-joystick movements -->
+        <!-- Default: 40.0; 10.0 (if using raw values, decrease by a factor of ~15: eg 2.6, 0.6) -->
+        <add key="摇杆陀螺仪敏感度X轴" value="40.0"/>
+        <add key="摇杆陀螺仪敏感度Y轴" value="10.0"/>
+        <!-- Stick range reduction when gyro-to-joystick is enabled and active; divides range by factor (so 1 is no change; 1.5 is halved range (with deadzone in mind)) -->
+        <!-- Default: 1.5 -->
+        <add key="摇杆范围缩小参数" value="1.5"/>
+        <!-- Gyro Hold/Toggle activation; true will require the mapped button to be continuously held down to keep gyro active -->
         <!-- Default: true [hold], false [toggle] -->
         <add key="通过按住或切换使用陀螺仪" value="true"/>
         <!-- When two joycons are connected, it would take the gyro movement of the right joycon for mouse movement. This swaps that -->
@@ -122,6 +132,14 @@
         <!-- Default: true -->
         <add key="长按Home键断开连接" value="true" />
 
+        <!-- Double click sticks on joycons (L3, R3) to change joycon orientation -->
+        <!-- Default: true -->
+        <add key="双击改变Joycons方向" value="true" />
+        <!-- Do not rejoin joycons once split via clicking on their icon -->
+        <!-- When 'true' allows you to double-click the joycons to split them and then change their orientation to vertical -->
+        <!-- Default: false -->
+        <add key="不重复连接Joycons" value="false" />
+
         <!-- Determines what type of debugging information to be printed -->
         <!-- None = 0 -->
         <!-- All = 1 -->

BetterJoyForCemu/BetterJoy.csproj

@@ -102,8 +102,8 @@
     <Reference Include="JetBrains.Annotations, Version=2020.1.0.0, Culture=neutral, PublicKeyToken=1010a0d8d6380325, processorArchitecture=MSIL">
       <HintPath>..\packages\JetBrains.Annotations.2020.1.0\lib\net20\JetBrains.Annotations.dll</HintPath>
     </Reference>
-    <Reference Include="Nefarius.ViGEm.Client, Version=1.17.175.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\Nefarius.ViGEm.Client.1.17.175\lib\net452\Nefarius.ViGEm.Client.dll</HintPath>
+    <Reference Include="Nefarius.ViGEm.Client, Version=1.17.178.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\Nefarius.ViGEm.Client.1.17.178\lib\net452\Nefarius.ViGEm.Client.dll</HintPath>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Configuration" />
@@ -119,8 +119,8 @@
     <Reference Include="Microsoft.CSharp" />
     <Reference Include="System.Data" />
     <Reference Include="System.Xml" />
-    <Reference Include="WindowsInput, Version=6.1.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\WindowsInput.6.1.0\lib\net461\WindowsInput.dll</HintPath>
+    <Reference Include="WindowsInput, Version=6.3.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\WindowsInput.6.3.0\lib\net461\WindowsInput.dll</HintPath>
     </Reference>
   </ItemGroup>
   <ItemGroup>
@@ -165,7 +165,7 @@
     <Compile Include="UpdServer.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="! Install the drivers in the Drivers folder">
+    <None Include="! 使用前必须先在Drivers文件夹里安装对应的驱动">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </None>
     <None Include="App.config">
@@ -186,6 +186,12 @@
     <None Include="Drivers\HIDGuardian\_drivers\HidGuardian\HidGuardian.sys">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </None>
+    <Content Include="Drivers\ViGEmBusSetup_x64.msi">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </Content>
+    <Content Include="Drivers\ViGEmBusSetup_x86.msi">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </Content>
     <None Include="packages.config" />
   </ItemGroup>
   <ItemGroup>
@@ -238,13 +244,13 @@
     <Content Include="Drivers\README.txt">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </Content>
-    <Content Include="Drivers\ViGEmBus_Setup_1.16.116.exe">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </Content>
     <Content Include="Icons\snes.png" />
     <None Include="Properties\app.manifest" />
     <Content Include="Icons\betterjoyforcemu_icon.ico" />
-    <Content Include="hidapi.dll">
+    <Content Include="x86\hidapi.dll">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </Content>
+    <Content Include="x64\hidapi.dll">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </Content>
     <Content Include="Icons\cross.png" />
@@ -286,4 +292,4 @@
   </ItemGroup>
   <ItemGroup />
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-</Project>
+</Project>