Helicopter/HeliBLE
2
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Message delimeter simplified

Browse Source
This commit is contained in:
Goga Coder
2024-03-01 22:36:43 +07:00
parent 3ac39136c6
commit 0763c2e1df
1 changed files with 6 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
app/src/main/java/com/helible/pilot/viewmodels/BluetoothViewModel.kt
View File

@@ -55,6 +55,9 @@ class BluetoothViewModel(
private val deviceStateMessageAdapter = moshi.adapter(DeviceState::class.java) private val deviceStateMessageAdapter = moshi.adapter(DeviceState::class.java)
private val pidSittingsMessageAdapter = moshi.adapter(PidSettings::class.java) private val pidSittingsMessageAdapter = moshi.adapter(PidSettings::class.java)
private val pidSittingsRequiredMessageAdapter = moshi.adapter(PidSettingRequiredMessage::class.java) private val pidSittingsRequiredMessageAdapter = moshi.adapter(PidSettingRequiredMessage::class.java)
companion object {
const val messageDelimeter = "\n"
}
init { init {
bluetoothController.isConnected.onEach { isConnected -> bluetoothController.isConnected.onEach { isConnected ->
@@ -203,20 +206,11 @@ class BluetoothViewModel(
super.onCleared() super.onCleared()
} }
fun sendHelloWorld() {
viewModelScope.launch {
bluetoothController.trySendMessage(
"{\"p1\": {\"p\": 1.5, \"i\": 1.5, \"d\": 1.5}}\n\r".toByteArray()
//"{\"p1\": [1.5, 1.5, 1.5]}\n\r".toByteArray()
)
}
}
fun startImuCalibration() { fun startImuCalibration() {
viewModelScope.launch { viewModelScope.launch {
val message = statusMessageAdapter.toJson( val message = statusMessageAdapter.toJson(
ChangedDeviceStatus(DeviceStatus.IsImuCalibration) ChangedDeviceStatus(DeviceStatus.IsImuCalibration)
) + "\n\r" ) + messageDelimeter
val isSuccess = bluetoothController.trySendMessage( val isSuccess = bluetoothController.trySendMessage(
message.toByteArray() message.toByteArray()
) )
@@ -234,7 +228,7 @@ class BluetoothViewModel(
fun requestPidSettings() { fun requestPidSettings() {
viewModelScope.launch { viewModelScope.launch {
val message = pidSittingsRequiredMessageAdapter.toJson(PidSettingRequiredMessage(true)) + "\n\r" val message = pidSittingsRequiredMessageAdapter.toJson(PidSettingRequiredMessage(true)) + messageDelimeter
Log.i("BluetoothVM", "Requested PID settings: $message") Log.i("BluetoothVM", "Requested PID settings: $message")
val isSuccess = bluetoothController.trySendMessage( val isSuccess = bluetoothController.trySendMessage(
message.toByteArray() message.toByteArray()
@@ -247,7 +241,7 @@ class BluetoothViewModel(
fun applyPidSettings(pidSettings: PidSettings) { fun applyPidSettings(pidSettings: PidSettings) {
viewModelScope.launch { viewModelScope.launch {
val message = pidSittingsMessageAdapter.toJson(pidSettings) + "\n\r" val message = pidSittingsMessageAdapter.toJson(pidSettings) + messageDelimeter
val isSuccess = bluetoothController.trySendMessage(message.toByteArray()) val isSuccess = bluetoothController.trySendMessage(message.toByteArray())
if(!isSuccess) { if(!isSuccess) {
Log.e("BluetoothVM", "Failed to request PID settings: $message") Log.e("BluetoothVM", "Failed to request PID settings: $message")