From cce68c35c305f55f2c4e3d1ed652352b5a1a407c Mon Sep 17 00:00:00 2001
From: David Khachaturov <d77777k@gmail.com>
Date: Wed, 22 Apr 2020 18:56:16 +0100
Subject: [PATCH]  - Removed Fody and co  - Began working on getting gyro into
 the right format after getting the driver to work!

---
 BetterJoyForCemu/BetterJoy.csproj | 21 ++-------------------
 BetterJoyForCemu/Joycon.cs        | 14 +++-----------
 BetterJoyForCemu/packages.config  |  5 +----
 3 files changed, 6 insertions(+), 34 deletions(-)

diff --git a/BetterJoyForCemu/BetterJoy.csproj b/BetterJoyForCemu/BetterJoy.csproj
index c37c4f0..5a61856 100644
--- a/BetterJoyForCemu/BetterJoy.csproj
+++ b/BetterJoyForCemu/BetterJoy.csproj
@@ -1,7 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="..\packages\Fielder.Fody.1.2.3\build\Fielder.Fody.props" Condition="Exists('..\packages\Fielder.Fody.1.2.3\build\Fielder.Fody.props')" />
-  <Import Project="..\packages\Costura.Fody.3.3.1\build\Costura.Fody.props" Condition="Exists('..\packages\Costura.Fody.3.3.1\build\Costura.Fody.props')" />
   <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
@@ -98,17 +96,11 @@
     <SignManifests>false</SignManifests>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="Costura, Version=3.3.1.0, Culture=neutral, PublicKeyToken=9919ef960d84173d, processorArchitecture=MSIL">
-      <HintPath>..\packages\Costura.Fody.3.3.1\lib\net40\Costura.dll</HintPath>
-    </Reference>
     <Reference Include="Crc32.NET, Version=1.0.0.0, Culture=neutral, PublicKeyToken=dc0b95cf99bf4e99, processorArchitecture=MSIL">
       <HintPath>..\packages\Crc32.NET.1.2.0\lib\net20\Crc32.NET.dll</HintPath>
     </Reference>
-    <Reference Include="Fielder, Version=1.2.3.0, Culture=neutral, PublicKeyToken=409b3227471b0f0d, processorArchitecture=MSIL">
-      <HintPath>..\packages\Fielder.Fody.1.2.3\lib\net452\Fielder.dll</HintPath>
-    </Reference>
-    <Reference Include="JetBrains.Annotations, Version=2018.3.0.0, Culture=neutral, PublicKeyToken=1010a0d8d6380325, processorArchitecture=MSIL">
-      <HintPath>..\packages\JetBrains.Annotations.2018.3.0\lib\net20\JetBrains.Annotations.dll</HintPath>
+    <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.0.0.0, Culture=neutral, processorArchitecture=MSIL">
       <HintPath>..\packages\Nefarius.ViGEm.Client.1.0.0\lib\net452\Nefarius.ViGEm.Client.dll</HintPath>
@@ -281,13 +273,4 @@
   </ItemGroup>
   <ItemGroup />
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
-    <PropertyGroup>
-      <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
-    </PropertyGroup>
-    <Error Condition="!Exists('..\packages\Fody.4.2.1\build\Fody.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Fody.4.2.1\build\Fody.targets'))" />
-    <Error Condition="!Exists('..\packages\Costura.Fody.3.3.1\build\Costura.Fody.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Costura.Fody.3.3.1\build\Costura.Fody.props'))" />
-    <Error Condition="!Exists('..\packages\Fielder.Fody.1.2.3\build\Fielder.Fody.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Fielder.Fody.1.2.3\build\Fielder.Fody.props'))" />
-  </Target>
-  <Import Project="..\packages\Fody.4.2.1\build\Fody.targets" Condition="Exists('..\packages\Fody.4.2.1\build\Fody.targets')" />
 </Project>
\ No newline at end of file
diff --git a/BetterJoyForCemu/Joycon.cs b/BetterJoyForCemu/Joycon.cs
index f9a15f7..de5c163 100644
--- a/BetterJoyForCemu/Joycon.cs
+++ b/BetterJoyForCemu/Joycon.cs
@@ -223,7 +223,7 @@ namespace BetterJoyForCemu {
 
 		public IXbox360Controller xin;
 		public IDualShock4Controller ds4;
-		short ds4_ts = 0;
+		ushort ds4_ts = 0;
 
 		int rumblePeriod = Int32.Parse(ConfigurationManager.AppSettings["RumblePeriod"]);
 		int lowFreq = Int32.Parse(ConfigurationManager.AppSettings["LowFreqRumble"]);
@@ -1003,22 +1003,14 @@ namespace BetterJoyForCemu {
 			// Gyro and accel
 			ds4_ts += 188; // 1.5ms
 			ds4.SetIMUTimestamp(ds4_ts);
-			/*Vector3 gyr = GetGyro() * 1024f;
+			Vector3 gyr = GetGyro(); //* 1024f;
 			ds4.SetIMUValue(DualShock4IMU.GyroX, (short) gyr.X);
 			ds4.SetIMUValue(DualShock4IMU.GyroY, (short) gyr.Y);
 			ds4.SetIMUValue(DualShock4IMU.GyroZ, (short) gyr.Z);
 			Vector3 acc = GetAccel() * 8192f;
 			ds4.SetIMUValue(DualShock4IMU.AccelX, (short) acc.X);
 			ds4.SetIMUValue(DualShock4IMU.AccelY, (short)-acc.Y);
-			ds4.SetIMUValue(DualShock4IMU.AccelZ, (short)acc.Z);*/
-			ds4_ts = 14;
-			ds4.SetIMUTimestamp(0);
-			ds4.SetIMUValue(DualShock4IMU.GyroX, ds4_ts);
-			ds4.SetIMUValue(DualShock4IMU.GyroY, ds4_ts);
-			ds4.SetIMUValue(DualShock4IMU.GyroZ, ds4_ts);
-			ds4.SetIMUValue(DualShock4IMU.AccelX, ds4_ts);
-			ds4.SetIMUValue(DualShock4IMU.AccelY, ds4_ts);
-			ds4.SetIMUValue(DualShock4IMU.AccelZ, ds4_ts);
+			ds4.SetIMUValue(DualShock4IMU.AccelZ, (short)acc.Z);
 		}
 
 		// Get Gyro/Accel data
diff --git a/BetterJoyForCemu/packages.config b/BetterJoyForCemu/packages.config
index 9bf532c..3be009d 100644
--- a/BetterJoyForCemu/packages.config
+++ b/BetterJoyForCemu/packages.config
@@ -1,10 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="Costura.Fody" version="3.3.1" targetFramework="net461" developmentDependency="true" />
   <package id="Crc32.NET" version="1.2.0" targetFramework="net461" />
-  <package id="Fielder.Fody" version="1.2.3" targetFramework="net461" />
-  <package id="Fody" version="4.2.1" targetFramework="net461" developmentDependency="true" />
-  <package id="JetBrains.Annotations" version="2018.3.0" targetFramework="net461" />
+  <package id="JetBrains.Annotations" version="2020.1.0" targetFramework="net461" />
   <package id="Nefarius.ViGEm.Client" version="1.0.0" targetFramework="net461" />
   <package id="WindowsInput" version="6.1.1" targetFramework="net461" />
 </packages>
\ No newline at end of file