diff --git a/app/src/main/java/com/helible/pilot/BluetoothController.kt b/app/src/main/java/com/helible/pilot/BluetoothController.kt index 3e9e4ef..bd0fdae 100644 --- a/app/src/main/java/com/helible/pilot/BluetoothController.kt +++ b/app/src/main/java/com/helible/pilot/BluetoothController.kt @@ -241,7 +241,7 @@ class AndroidBluetoothController(private val context: Context) : BluetoothContro if(dataTransferService == null) { return null } - dataTransferService?.sendMessage("R1399\n\r".toByteArray()) + dataTransferService?.sendMessage("R1250\n\r".toByteArray()) return message } diff --git a/app/src/main/java/com/helible/pilot/BluetoothViewModel.kt b/app/src/main/java/com/helible/pilot/BluetoothViewModel.kt index 74ddfff..f281c8d 100644 --- a/app/src/main/java/com/helible/pilot/BluetoothViewModel.kt +++ b/app/src/main/java/com/helible/pilot/BluetoothViewModel.kt @@ -1,6 +1,5 @@ package com.helible.pilot -import android.bluetooth.BluetoothDevice import androidx.lifecycle.ViewModel import androidx.lifecycle.viewModelScope import kotlinx.coroutines.Job @@ -84,7 +83,7 @@ class BluetoothViewModel( } } } - .catch { throwable -> + .catch { _ -> bluetoothController.closeConnection() _state.update { it.copy( diff --git a/app/src/main/java/com/helible/pilot/MainActivity.kt b/app/src/main/java/com/helible/pilot/MainActivity.kt index 6bcf758..64a2b4a 100644 --- a/app/src/main/java/com/helible/pilot/MainActivity.kt +++ b/app/src/main/java/com/helible/pilot/MainActivity.kt @@ -8,6 +8,7 @@ import android.os.Bundle import android.util.Log import android.widget.Toast import androidx.activity.ComponentActivity +import androidx.activity.compose.BackHandler import androidx.activity.compose.rememberLauncherForActivityResult import androidx.activity.compose.setContent import androidx.activity.result.contract.ActivityResultContracts @@ -162,6 +163,11 @@ class MainActivity : ComponentActivity() { bluetoothViewModel.connectToDevice(device) } } + BackHandler { + bluetoothViewModel.disconnectFromDevice() + Log.i("FlightScreen", "Disconnected from device") + navController.navigate("scanner") + } when { bluetoothState.isConnecting -> { Column(