From c8199b90446dccada9e2daf158798ab420419b99 Mon Sep 17 00:00:00 2001 From: Pritimay Sarkar Date: Wed, 2 Aug 2023 23:23:47 +0530 Subject: [PATCH] merge --- .../example/hpostesting/data/constant/HemoCubeCommands.kt | 5 +++++ .../hpostesting/data/model/patient/HemoCubeTestData.kt | 4 ++-- .../hpostesting/presentation/testRight/TestRightViewModel.kt | 2 -- 3 files changed, 7 insertions(+), 4 deletions(-) create mode 100644 app/src/main/java/com/example/hpostesting/data/constant/HemoCubeCommands.kt diff --git a/app/src/main/java/com/example/hpostesting/data/constant/HemoCubeCommands.kt b/app/src/main/java/com/example/hpostesting/data/constant/HemoCubeCommands.kt new file mode 100644 index 0000000..09bf400 --- /dev/null +++ b/app/src/main/java/com/example/hpostesting/data/constant/HemoCubeCommands.kt @@ -0,0 +1,5 @@ +package com.example.hpostesting.data.constant + +enum class HemoCubeCommands(val command: String) { + run("R\r"), +} \ No newline at end of file diff --git a/app/src/main/java/com/example/hpostesting/data/model/patient/HemoCubeTestData.kt b/app/src/main/java/com/example/hpostesting/data/model/patient/HemoCubeTestData.kt index 8e19da6..2d4f146 100644 --- a/app/src/main/java/com/example/hpostesting/data/model/patient/HemoCubeTestData.kt +++ b/app/src/main/java/com/example/hpostesting/data/model/patient/HemoCubeTestData.kt @@ -22,8 +22,8 @@ data class HemoCubeTestData( var led2Buffer: Double? = null, var led1Sample: Double? = null, var led2Sample: Double? = null, - var led1Avarage: Double? = null, - var led2Avarage: Double? = null, + var led1Average: Double? = null, + var led2Average: Double? = null, var deviceRatio: Double? = null, var calculatedRatio: Double? = null ) diff --git a/app/src/main/java/com/example/hpostesting/presentation/testRight/TestRightViewModel.kt b/app/src/main/java/com/example/hpostesting/presentation/testRight/TestRightViewModel.kt index ef254d1..636f8b3 100644 --- a/app/src/main/java/com/example/hpostesting/presentation/testRight/TestRightViewModel.kt +++ b/app/src/main/java/com/example/hpostesting/presentation/testRight/TestRightViewModel.kt @@ -532,6 +532,4 @@ class TestRightViewModel @Inject constructor( fun deleteById(userId: String) = viewModelScope.launch { userDao.deleteById(id = userId) } - - } \ No newline at end of file