Fix issues with controller timing out when it shouldn't

SkyeOfBreeze · Mar 5, 2021 · e269523 · e269523
1 parent 6b24789
commit e269523
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 4 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -29,8 +29,8 @@ android {
         applicationId "org.btelman.controller.rvr"
         minSdkVersion 18
         targetSdkVersion 29
-        versionCode 8
-        versionName "1.3.2"
+        versionCode 9
+        versionName "1.3.3"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }
     buildTypes {

diff --git a/app/src/main/java/org/btelman/controller/rvr/activities/MainActivity.kt b/app/src/main/java/org/btelman/controller/rvr/activities/MainActivity.kt
@@ -281,7 +281,7 @@ class MainActivity : AppCompatActivity() {
         viewModelRVR?.let { viewModel->
             if(viewModel.connected.value == true){
                 val lastInputCommand = System.currentTimeMillis() - inputHandler.lastUpdated
-                if(lastInputCommand > prefsManager.timeoutMs){
+                if(!inputHandler.isInputGamepad && lastInputCommand > prefsManager.timeoutMs){
                     if(timedOut && lastInputCommand > prefsManager.timeoutMs + 1000) return //allow it to send the stop command for a second
                     timedOut = true
                     left = 0f

diff --git a/app/src/main/java/org/btelman/controller/rvr/utils/InputHandler.kt b/app/src/main/java/org/btelman/controller/rvr/utils/InputHandler.kt
@@ -14,6 +14,10 @@ class InputHandler(
 ) : RemoReceiver.RemoListener, JoystickSurfaceView.JoystickUpdateListener,
     GamepadHandler.GamepadListener {
     private var lastGamepadId: Int? = null
+    val isInputGamepad : Boolean
+        get() {
+            return lastGamepadId != null
+        }
     var right = 0.0f
     var left = 0.0f
     var lastUpdated = System.currentTimeMillis()
@@ -71,7 +75,7 @@ class InputHandler(
         historyPos: Int
     ) {
 
-        val mInputDevice = event.device
+        val mInputDevice = event.device ?: return
 
         // Calculate the vertical distance to move by
         // using the input value from one of these physical controls:
@@ -93,6 +97,7 @@ class InputHandler(
     }
 
     override fun onCommand(command: String) {
+        lastGamepadId = null
         Log.d("InputHandler",command)
         val linearSpeed : Float
         val rotateSpeed : Float
@@ -126,6 +131,7 @@ class InputHandler(
     }
 
     override fun OnJoystickUpdate(id: Int, joystickAxes: FloatArray?) {
+        lastGamepadId = null
         if(joystickAxes == null) return
         val y = joystickAxes[0]
         val x = joystickAxes[1]
@@ -147,6 +153,8 @@ class InputHandler(
             Toast.makeText(context, "Lost connection to gamepad", Toast.LENGTH_SHORT).show()
             left = 0f
             right = 0f
+            lastGamepadId = null
+            lastUpdated = System.currentTimeMillis()
             sendInputUpdatedEvent()
         }
     }