sensor controls improvements

asafonov · Apr 23, 2024 · e101537 · e101537
1 parent ad51862
commit e101537
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 14 deletions.
diff --git a/DONATE.md b/DONATE.md
@@ -7,7 +7,7 @@ Accelerrace is an open source project, and your donations support the developer,
 Platform | Link
 --- | ---
 Yoomoney | [Donate](https://yoomoney.ru/to/41001650076246) |
-Bitcoin | bc1q59s7n40733knymc26fc6kz05xug5x46skhe3rg | 
+Bitcoin | 1JWPruZxtT9NwgkrRseeXBbM73ygh1rr3n | 
 
 Thank you!
 

diff --git a/app/build.gradle b/app/build.gradle
@@ -7,8 +7,8 @@ android {
         applicationId "org.asafonov.accelerace"
         minSdkVersion 21
         targetSdkVersion 33
-        versionCode 5
-        versionName "0.5"
+        versionCode 6
+        versionName "0.6"
     }
     buildTypes {
         release {

diff --git a/app/src/main/java/org/asafonov/accelerace/MainActivity.java b/app/src/main/java/org/asafonov/accelerace/MainActivity.java
@@ -25,7 +25,7 @@ protected void onCreate(Bundle savedInstanceState) {
         angle = 0;
         setContentView(R.layout.activity_main);
         sensorManager = (SensorManager) getSystemService(Context.SENSOR_SERVICE);
-        sensor = sensorManager.getDefaultSensor(Sensor.TYPE_GYROSCOPE);
+        sensor = sensorManager.getDefaultSensor(Sensor.TYPE_ORIENTATION);
         mWebView = findViewById(R.id.activity_main_webview);
         WebSettings webSettings = mWebView.getSettings();
         webSettings.setJavaScriptEnabled(true);
@@ -60,18 +60,22 @@ public void onAccuracyChanged(Sensor sensor, int accuracy) {
         }
 
         public void onSensorChanged(SensorEvent event) {
-            angle += event.values[1];
-            double b = 8;
+            double y = event.values[2];
+            double threshold = 12;
             String condition = "window !== null && window !== undefined && !! window.asafonov && !! asafonov.messageBus && !! asafonov.messageBus.send";
 
-            if (angle > b) {
-              angle = 0;
-              mWebView.evaluateJavascript("if (" + condition + ") asafonov.messageBus.send(asafonov.events.CAR_MOVE_RIGHT)", null);
-            }
-
-            if (angle < -b) {
-              angle = 0;
-              mWebView.evaluateJavascript("if (" + condition + ") asafonov.messageBus.send(asafonov.events.CAR_MOVE_LEFT)", null);
+            if (y > threshold) {
+                mWebView.evaluateJavascript("if (" + condition + ") asafonov.messageBus.send(asafonov.events.CAR_MOVE_RIGHT)", null);
+                angle = threshold;
+            } else if (y < -threshold) {
+                mWebView.evaluateJavascript("if (" + condition + ") asafonov.messageBus.send(asafonov.events.CAR_MOVE_LEFT)", null);
+                angle = -threshold;
+            } else if (angle < 0) {
+                mWebView.evaluateJavascript("if (" + condition + ") asafonov.messageBus.send(asafonov.events.CAR_MOVE_RIGHT)", null);
+                angle = 0;
+            } else if (angle > 0) {
+                mWebView.evaluateJavascript("if (" + condition + ") asafonov.messageBus.send(asafonov.events.CAR_MOVE_LEFT)", null);
+                angle = 0;
             }
         }
     };

diff --git a/metadata/en-US/changelogs/6.txt b/metadata/en-US/changelogs/6.txt
@@ -0,0 +1,2 @@
+* Improvements of control via gyroscope sensor
+* Minor bugfixes