Release 2.3.0

teamclouday · Nov 6, 2022 · 8229e37 · 8229e37
1 parent 239f5f0
commit 8229e37
Show file tree

Hide file tree

Showing 16 changed files with 48 additions and 16 deletions.
diff --git a/Android/app/build.gradle b/Android/app/build.gradle
@@ -6,8 +6,8 @@ android {
         applicationId "com.example.androidsteering"
         minSdkVersion 19
         targetSdkVersion 33
-        versionCode 6
-        versionName "2.2.0"
+        versionCode 7
+        versionName "2.3.0"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }
     buildTypes {

diff --git a/Android/app/src/main/java/com/example/androidsteering/MainActivity.java b/Android/app/src/main/java/com/example/androidsteering/MainActivity.java
@@ -75,17 +75,28 @@ public void run() {
                     vHorizontal.setProgress((int) progressHorizontal);
                     vVertical.setProgress((int) progressVertical);
                 }
-                if (controllerMode == ControllerMode.Alter || controllerMode == ControllerMode.GamePad) {
-                    if (!LTPressed && !RTPressed)
+                if (controllerMode == ControllerMode.Alter) {
+                    if (!LTPressed && !RTPressed) {
                         globalBuffer.addData(MotionStatus.ResetAccAngle, 0.0f);
-                    if (LTPressed) {
+                    } else if (LTPressed) {
                         ProgressBar bar = findViewById(R.id.progressBarLT);
                         globalBuffer.addData(MotionStatus.SetAccRatio, -bar.getProgress() / (float) bar.getMax());
-                    }
-                    if (RTPressed && (!LTPressed || controllerMode == ControllerMode.GamePad)) {
+                    } else if (RTPressed) {
                         ProgressBar bar = findViewById(R.id.progressBarRT);
                         globalBuffer.addData(MotionStatus.SetAccRatio, bar.getProgress() / (float) bar.getMax());
                     }
+                } else if (controllerMode == ControllerMode.GamePad) {
+                    if (!LTPressed && !RTPressed) {
+                        globalBuffer.addData(MotionStatus.ResetAccAngle, 0.0f);
+                    }
+                    if (LTPressed) {
+                        ProgressBar bar = findViewById(R.id.progressBarLT);
+                        globalBuffer.addData(MotionStatus.SetLTValue, bar.getProgress() / (float) bar.getMax());
+                    }
+                    if (RTPressed) {
+                        ProgressBar bar = findViewById(R.id.progressBarRT);
+                        globalBuffer.addData(MotionStatus.SetRTValue, bar.getProgress() / (float) bar.getMax());
+                    }
                 }
             } catch (Exception e) {
                 Log.d(getString(R.string.logTagMain), Objects.requireNonNull(e.getMessage()));
@@ -458,8 +469,8 @@ private Pair<Float, Float> computeJoyStickXY(int angle, int strength) {
         double r = Math.toRadians(angle);
         double s = strength / 100.0;
 
-        float x = (float)(Math.cos(r) * s);
-        float y = (float)(Math.sin(r) * s);
+        float x = (float) (Math.cos(r) * s);
+        float y = (float) (Math.sin(r) * s);
 
         return new Pair<>(x, y);
     }

diff --git a/Android/app/src/main/java/com/example/androidsteering/Motion.java b/Android/app/src/main/java/com/example/androidsteering/Motion.java
@@ -21,7 +21,9 @@ enum MotionStatus {
     SetLeftStickX(5),
     SetLeftStickY(6),
     SetRightStickX(7),
-    SetRightStickY(8);
+    SetRightStickY(8),
+    SetLTValue(9),
+    SetRTValue(10);
 
     private final int val;
 

diff --git a/Assets/phone1.jpg b/Assets/phone1.jpg
diff --git a/Assets/phone1.png b/Assets/phone1.png
diff --git a/Assets/phone2.jpg b/Assets/phone2.jpg
diff --git a/Assets/phone2.png b/Assets/phone2.png
diff --git a/Assets/phone3.jpg b/Assets/phone3.jpg
diff --git a/Assets/phone3.png b/Assets/phone3.png
diff --git a/Assets/phone4.jpg b/Assets/phone4.jpg
diff --git a/Assets/phone4.png b/Assets/phone4.png
diff --git a/Assets/phone5.jpg b/Assets/phone5.jpg
diff --git a/Assets/phone5.png b/Assets/phone5.png
diff --git a/README.md b/README.md
@@ -102,6 +102,7 @@ See [Game Steering Wheel Settings](SETTINGS.md) for more details.
 - [x] Slider bar on phone for LT/RT controls
 - [x] Memorized user settings
 - [x] Connection under same network (does not have to be Wifi hotspot)
+- [x] Fully implemented Xbox controller emulator
 
 ------
 
@@ -115,15 +116,15 @@ Pre-built installers can be found [here](https://github.com/teamclouday/AndroidS
 
 __Android Side__
 
-<img src="Assets/phone1.jpg" width="400" alt="phone1">
+<img src="Assets/phone1.png" width="600" alt="phone1">
 
-<img src="Assets/phone2.jpg" width="400" alt="phone2">
+<img src="Assets/phone2.png" width="600" alt="phone2">
 
-<img src="Assets/phone3.jpg" width="400" alt="phone3">
+<img src="Assets/phone3.png" width="600" alt="phone3">
 
-<img src="Assets/phone4.jpg" width="400" alt="phone4">
+<img src="Assets/phone4.png" width="600" alt="phone4">
 
-<img src="Assets/phone5.jpg" width="400" alt="phone6">
+<img src="Assets/phone5.png" width="600" alt="phone6">
 
 __Windows Side__
 

diff --git a/Windows/SteeringWheel/Controller.cs b/Windows/SteeringWheel/Controller.cs
@@ -31,6 +31,8 @@ public enum MotionStatus
         SetLeftStickY = 6,
         SetRightStickX = 7,
         SetRightStickY = 8,
+        SetLTValue = 9,
+        SetRTValue = 10,
     }
 
     /// <summary>
@@ -308,6 +310,22 @@ private void SetupProcess()
                                     }
                                     break;
                                 }
+                            case MotionStatus.SetLTValue:
+                                {
+                                    lock (joyReportLock)
+                                    {
+                                        joyReport.AxisZ = (int)(data.Value * axisMax);
+                                    }
+                                    break;
+                                }
+                            case MotionStatus.SetRTValue:
+                                {
+                                    lock (joyReportLock)
+                                    {
+                                        joyReport.AxisZRot = (int)(data.Value * axisMax);
+                                    }
+                                    break;
+                                }
                         }
                     }
                 }

diff --git a/Windows/SteeringWheel/SteeringWheel.csproj b/Windows/SteeringWheel/SteeringWheel.csproj
@@ -30,7 +30,7 @@
     <PublisherName>Teamclouday</PublisherName>
     <OpenBrowserOnPublish>false</OpenBrowserOnPublish>
     <ApplicationRevision>0</ApplicationRevision>
-    <ApplicationVersion>2.2.0.0</ApplicationVersion>
+    <ApplicationVersion>2.3.0.0</ApplicationVersion>
     <UseApplicationTrust>false</UseApplicationTrust>
     <PublishWizardCompleted>true</PublishWizardCompleted>
     <BootstrapperEnabled>true</BootstrapperEnabled>