smiuser/hpos
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 4 Wiki Activity

Merge branch 'preprod' into 'variable-buffer-thresholds'

Browse Source 
# Conflicts:
#   app/src/main/java/com/example/hpostesting/data/constant/Constants.kt
This commit is contained in:
Pritimay Sarkar
2023-11-16 10:00:22 +00:00
parent 6e9850c492 5982ce822f
commit a1206dbe0d
8 changed files with 103 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
app/src/main/java/com/example/hpostesting/data/constant/Constants.kt
View File

@@ -80,16 +80,16 @@ object Constants {
val DEVICE_CONFIGURATION: Map<String, List<List<Double>>> = mapOf<String, List<List<Double>>>(
"HCV-000-3001" to listOf(
listOf(1.264817, -0.85965), // LED1
listOf(0.581462456, -0.58502), // LED2
listOf(0.184991, 0.184991), // LED3
listOf(1.264817, -0.85965), // LED1, 435nm
listOf(0.581462456, -0.58502), // LED2, 415nm
listOf(0.184991, 0.001704), // LED3, 555nm
listOf(1.0, 0.0) // LED4
),
"HCV-000-3002" to listOf(
listOf(1.264817, -0.85965), // LED1
listOf(0.581462456, -0.58502), // LED2
listOf(0.184991, 0.184991), // LED3
listOf(1.0, 0.0) // LED4
listOf(1.264817, -0.85965),
listOf(0.581462456, -0.58502),
listOf(0.184991, 0.001704),
listOf(1.0, 0.0)
),
)

2
app/src/main/java/com/example/hpostesting/data/dao/MyDataBase.kt
View File

@@ -11,7 +11,7 @@ import com.example.hpostesting.data.model.patient.HemoCubeTestData
import com.google.android.datatransport.runtime.dagger.Provides
import javax.inject.Singleton
@Database(entities = [UserData::class, HemoCubeTestData::class, DeviceData::class], version = 8, exportSchema = false)
@Database(entities = [UserData::class, HemoCubeTestData::class, DeviceData::class], version = 10, exportSchema = false)
@TypeConverters(Converters::class)
abstract class MyDatabase : RoomDatabase() {
abstract fun userDao(): UserDao

5
app/src/main/java/com/example/hpostesting/data/model/patient/HemoCubeTestData.kt
View File

@@ -46,4 +46,9 @@ data class HemoCubeTestData(
var coefficients: String? = "",
var classificationResult: String = "",
var prdClassification: String = "",
var batteryLevel: String = "",
var batteryCapacity: String = "",
var batteryMaxCapacity: String = "",
var batteryTemperature: String = "",
var batteryVoltage: String = "",
)