Merge branch 'dev' of https://gitlab.com/sminnovations/hpos into dev

# Conflicts:
#   app/src/main/java/com/example/hpostesting/data/repository/DatabaseRepository.kt
#   app/src/main/java/com/example/hpostesting/data/repository/Repository.kt

app/build.gradle

@@ -19,8 +19,8 @@ android {
         applicationId "in.sminnovations.hpostesting.dev"
         minSdk 21
         targetSdk 34
-        versionCode 114
-        versionName "2.1.114"
+        versionCode 112
+        versionName "2.1.112"
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }
@@ -80,16 +80,16 @@ dependencies {
     implementation 'com.google.firebase:firebase-auth-ktx'
     implementation 'com.google.firebase:firebase-storage-ktx'
     implementation 'com.firebaseui:firebase-ui-firestore:8.0.2'
-    implementation 'com.google.android.gms:play-services-auth:20.7.0'
+    implementation 'com.google.android.gms:play-services-auth:21.0.0'
     implementation 'com.google.android.gms:play-services-location:21.1.0'
     implementation 'com.google.android.gms:play-services-ads-identifier:18.0.1'
     implementation 'com.google.android.things:androidthings:1.0'
-    implementation 'com.google.firebase:firebase-appdistribution:16.0.0-beta11'
-    implementation("com.google.firebase:firebase-appdistribution-api-ktx:16.0.0-beta11")
+    implementation 'com.google.firebase:firebase-appdistribution:16.0.0-beta12'
+    implementation("com.google.firebase:firebase-appdistribution-api-ktx:16.0.0-beta12")
     implementation 'androidx.preference:preference-ktx:1.2.1'
     implementation 'androidx.preference:preference-ktx:1.2.1'
     implementation 'com.google.android.play:core:1.10.3'
-    implementation 'io.nats:jnats:2.11.2'
+    implementation 'io.nats:jnats:2.11.4'
 
 
 
@@ -143,8 +143,8 @@ dependencies {
     annotationProcessor 'com.github.bumptech.glide:compiler:4.13.2'
 
     // Navigation Component
-    implementation "androidx.navigation:navigation-fragment-ktx:2.7.6"
-    implementation "androidx.navigation:navigation-ui-ktx:2.7.6"
+    implementation "androidx.navigation:navigation-fragment-ktx:2.7.7"
+    implementation "androidx.navigation:navigation-ui-ktx:2.7.7"
 
     //Dagger - Hilt
     implementation "com.google.dagger:hilt-android:2.46"

app/src/main/java/com/example/hpostesting/HPOSTestingApplication.kt

@@ -1,20 +1,15 @@
 package com.example.hpostesting
 
 import android.app.Application
-import android.content.Context
-import androidx.room.Room
-import com.example.hpostesting.data.dao.MyDatabase
-import com.google.android.datatransport.runtime.dagger.Provides
 import com.google.firebase.firestore.FirebaseFirestore
 import com.google.firebase.firestore.FirebaseFirestoreSettings
 import dagger.hilt.android.HiltAndroidApp
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.SupervisorJob
-import javax.inject.Singleton
 
 @HiltAndroidApp
-class HPOSTestingApplication: Application() {
+class HPOSTestingApplication : Application() {
     val applicationScope = CoroutineScope(SupervisorJob() + Dispatchers.IO)
 
     override fun onCreate() {

app/src/main/java/com/example/hpostesting/data/api/MolbioAuthApi.kt

@@ -1,5 +1,7 @@
 package com.example.hpostesting.data.api
 
+import com.example.hpostesting.data.model.devicediagnostics.DeviceDiagnosticsRequest
+import com.example.hpostesting.data.model.devicediagnostics.DeviceDiagnosticsResponse
 import com.example.hpostesting.data.model.deviceprovision.DeviceProvisionRequest
 import com.example.hpostesting.data.model.deviceprovision.DeviceProvisionResponse
 import com.example.hpostesting.data.model.login.LoginRequest
@@ -11,11 +13,12 @@ interface MolbioAuthApi {
 
     @POST("deviceManagement/device/provision")
     suspend fun deviceProvision(
-        @Body deviceProvisionRequest: DeviceProvisionRequest
+        @Body deviceProvisionRequest: DeviceProvisionRequest,
     ): DeviceProvisionResponse
 
     @POST("deviceService/device/login")
     suspend fun login(
-        @Body loginRequest: LoginRequest
+        @Body loginRequest: LoginRequest,
     ): LoginResponse
+
 }

app/src/main/java/com/example/hpostesting/data/api/MolbioResultApi.kt

@@ -1,5 +1,7 @@
 package com.example.hpostesting.data.api
 
+import com.example.hpostesting.data.model.devicediagnostics.DeviceDiagnosticsRequest
+import com.example.hpostesting.data.model.devicediagnostics.DeviceDiagnosticsResponse
 import com.example.hpostesting.data.model.log.UploadLogsResponse
 import com.example.hpostesting.data.model.molbioresult.MolbioV2ResultRequest
 import com.example.hpostesting.data.model.molbioresult.MolbioV2ResultResponse
@@ -7,11 +9,9 @@ import com.example.hpostesting.data.model.updates.CheckUpdateRequest
 import com.example.hpostesting.data.model.updates.CheckUpdateResponse
 import com.example.hpostesting.data.model.updates.DeviceUpdateRequest
 import okhttp3.MultipartBody
-import okhttp3.Response
 import okhttp3.ResponseBody
 import retrofit2.http.Body
 import retrofit2.http.GET
-import retrofit2.http.Header
 import retrofit2.http.Multipart
 import retrofit2.http.POST
 import retrofit2.http.PUT
@@ -21,17 +21,17 @@ interface MolbioResultApi {
 
     @PUT("deviceService/results/HPOS")
     suspend fun uploadResults(
-        @Body molbioV2ResultRequest: MolbioV2ResultRequest
+        @Body molbioV2ResultRequest: MolbioV2ResultRequest,
     ): MolbioV2ResultResponse
 
     @POST("deviceService/device/checkUpdate")
     suspend fun checkUpdate(
-        @Body checkUpdateRequest: CheckUpdateRequest
+        @Body checkUpdateRequest: CheckUpdateRequest,
     ): CheckUpdateResponse
 
     @POST("deviceService/device/getUpdate")
     suspend fun deviceUpdate(
-        @Body deviceUpdateRequest: DeviceUpdateRequest
+        @Body deviceUpdateRequest: DeviceUpdateRequest,
     ): ResponseBody
 
     @GET("deviceService/device/getClientCertificate")
@@ -41,6 +41,12 @@ interface MolbioResultApi {
     @Multipart
     @POST("deviceService/device/uploadLogs")
     suspend fun uploadLogs(
-        @Part logFile: MultipartBody.Part
+        @Part logFile: MultipartBody.Part,
     ): UploadLogsResponse
+
+
+    @PUT("deviceService/device/uploadDeviceDiagnostics")
+    suspend fun deviceDiagnostics(
+        @Body deviceDiagnosticsRequest: DeviceDiagnosticsRequest
+    ): DeviceDiagnosticsResponse
 }

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

@@ -170,6 +170,57 @@ object Constants {
         "HPP1-0124-0048",
         "HPP1-0124-0049",
         "HPP1-0124-0050",
+        "HCV-001-0001",
+        "HCV-001-0002",
+        "HCV-001-0003",
+        "HCV-001-0004",
+        "HCV-001-0005",
+        "HCV-001-0006",
+        "HCV-001-0007",
+        "HCV-001-0008",
+        "HCV-001-0009",
+        "HCV-001-0010",
+        "HCV-001-0011",
+        "HCV-001-0012",
+        "HCV-001-0013",
+        "HCV-001-0014",
+        "HCV-001-0015",
+        "HCV-001-0016",
+        "HCV-001-0017",
+        "HCV-001-0018",
+        "HCV-001-0019",
+        "HCV-001-0020",
+        "HCV-001-0021",
+        "HCV-001-0022",
+        "HCV-001-0023",
+        "HCV-001-0024",
+        "HCV-001-0025",
+        "HCV-001-0026",
+        "HCV-001-0027",
+        "HCV-001-0028",
+        "HCV-001-0029",
+        "HCV-001-0030",
+        "HCV-001-0031",
+        "HCV-001-0032",
+        "HCV-001-0033",
+        "HCV-001-0034",
+        "HCV-001-0003",
+        "HCV-001-0035",
+        "HCV-001-0036",
+        "HCV-001-0037",
+        "HCV-001-0038",
+        "HCV-001-0039",
+        "HCV-001-0040",
+        "HCV-001-0041",
+        "HCV-001-0042",
+        "HCV-001-0043",
+        "HCV-001-0044",
+        "HCV-001-0045",
+        "HCV-001-0046",
+        "HCV-001-0047",
+        "HCV-001-0048",
+        "HCV-001-0049",
+        "HCV-001-0050",
     )
 
     const val password = "SMI@12345"
@@ -186,19 +237,6 @@ object Constants {
     const val BUFFER_LED_LOWER_BOUND = 21000
     const val BUFFER_LED_UPPER_BOUND = 23500
 
-    const val TEST_STATUS_CODE_TEST_STARTED = 1.0
-    const val TEST_STATUS_CODE_CONFIG_STARTED = 2.0
-    const val TEST_STATUS_CODE_CONFIG_COMPLETED = 3.0
-    const val TEST_STATUS_CODE_BUFFER_STARTED = 4.0
-    const val TEST_STATUS_CODE_BUFFER_COMPLETED = 5.0
-    const val TEST_STATUS_CODE_BUFFER_PRINT_STARTED = 6.0
-    const val TEST_STATUS_CODE_BUFFER_PRINT_COMPLETED = 7.0
-    const val TEST_STATUS_CODE_SAMPLE_STARTED = 8.0
-    const val TEST_STATUS_CODE_SAMPLE_COMPLETED = 9.0
-    const val TEST_STATUS_CODE_SAMPLE_PRINT_STARTED = 10.0
-    const val TEST_STATUS_CODE_SAMPLE_PRINT_COMPLETED = 11.0
-    const val TEST_STATUS_CODE_TEST_COMPLETED = 12.0
-
     val DEVICE_CONFIGURATION: Map<String, List<List<Double>>> = mapOf<String, List<List<Double>>>(
         "HCV-000-3001" to listOf(
             listOf(1.0, 0.0),               // LED1, 435nm
@@ -1665,8 +1703,8 @@ object Constants {
 
     val COEFFICIENTS: Map<String, List<List<Double>>> = mapOf(
         "HC-V1-005" to listOf(
-            listOf(1.5,0.0),
-            listOf(0.0,0.0)
+            listOf(1.5, 0.0),
+            listOf(0.0, 0.0)
         )
     )
 

app/src/main/java/com/example/hpostesting/data/constant/HemoCubeCommands.kt

@@ -3,12 +3,14 @@ package com.example.hpostesting.data.constant
 enum class HemoCubeCommands(val command: String) {
     START_BUFFER_COMMAND("B\r"),
     AUTO_DAC_COMMAND("C\r"),
+    SET_AUTO_DAC_TO_EPROM_COMMAND("G\r"),
     DIAGNOSTICS_COMMAND("D\r"),
     FIRMWARE_INFO_COMMAND("F\r"),
     START_SAMPLE("S\r"),
     PRINT_COMMAND("P\r"),
     READ_DAC_COMMAND("R\r"),
     DEVICE_CONFIGURATION_COMMAND("I\r"),
+    LOAD_DAC_VALUES("E\r"),
     FIRST_GAIN_COMMAND("T\r"),
     SECOND_GAIN_COMMAND("U\r"),
     THIRD_GAIN_COMMAND("V\r"),

app/src/main/java/com/example/hpostesting/data/constant/LanguageManager.kt

@@ -19,12 +19,14 @@ object LanguageManager {
     }
 
     fun persistLanguagePreference(context: Context, languageCode: String) {
-        val prefs: SharedPreferences = context.getSharedPreferences("AppPrefs", Context.MODE_PRIVATE)
+        val prefs: SharedPreferences =
+            context.getSharedPreferences("AppPrefs", Context.MODE_PRIVATE)
         prefs.edit().putString(LANGUAGE_PREF_KEY, languageCode).apply()
     }
 
     fun getSavedLanguage(context: Context): String {
-        val prefs: SharedPreferences = context.getSharedPreferences("AppPrefs", Context.MODE_PRIVATE)
+        val prefs: SharedPreferences =
+            context.getSharedPreferences("AppPrefs", Context.MODE_PRIVATE)
         return prefs.getString(LANGUAGE_PREF_KEY, "en") ?: "en"
     }
 }

app/src/main/java/com/example/hpostesting/data/constant/TestStatus.kt

@@ -8,7 +8,9 @@ enum class TestStatus(val code: Double) {
     FIRST_EMPTY_AIR_READING_COMPLETED(4.2),
     FIRST_EMPTY_AIR_READING_PRINT_STARTED(4.3),
     FIRST_EMPTY_AIR_READING_PRINT_COMPLETED(4.4),
-    BUFFER_STARTED(4.0),
+    EPROM_ADC_RETRIEVAL_STARTED(4.5),
+    EPROM_ADC_RETRIEVAL_COMPLETED(4.6),
+    BUFFER_STARTED(4.7),
     BUFFER_COMPLETED(5.0),
     BUFFER_PRINT_STARTED(6.0),
     BUFFER_PRINT_COMPLETED(7.0),

app/src/main/java/com/example/hpostesting/data/dao/Converters.kt

@@ -16,6 +16,7 @@ class Converters {
             null
         }
     }
+
     @TypeConverter
     fun toString(location: UserData.Location?): String? {
         return if (location != null) {

app/src/main/java/com/example/hpostesting/data/dao/DeviceDao.kt

@@ -7,7 +7,7 @@ import androidx.room.OnConflictStrategy
 import androidx.room.Query
 import com.example.hpostesting.data.model.patient.DeviceData
 import com.example.hpostesting.data.model.patient.HemoCubeTestData
-import com.example.hpostesting.data.model.patient.UserData
+
 @Dao
 interface DeviceDao {
     @Query("SELECT * from device_table")

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

@@ -8,7 +8,11 @@ import com.example.hpostesting.data.model.patient.DeviceData
 import com.example.hpostesting.data.model.patient.HemoCubeTestData
 import com.example.hpostesting.data.model.patient.UserData
 
-@Database(entities = [UserData::class, HemoCubeTestData::class, DeviceData::class, BufferCheckData::class], version = 26, exportSchema = false)
+@Database(
+    entities = [UserData::class, HemoCubeTestData::class, DeviceData::class, BufferCheckData::class],
+    version = 26,
+    exportSchema = false
+)
 @TypeConverters(Converters::class)
 abstract class MyDatabase : RoomDatabase() {
     abstract fun userDao(): UserDao

app/src/main/java/com/example/hpostesting/data/datasource/LocalFileDataSource.kt

@@ -1,11 +1,6 @@
 package com.example.hpostesting.data.datasource
 
-import android.os.Environment
 import com.example.hpostesting.data.model.patient.HemoCubeTestData
-import com.opencsv.CSVWriter
-import java.io.File
-import java.io.FileWriter
-import java.io.IOException
 
 interface LocalFileDataSource {
 
@@ -14,6 +9,6 @@ interface LocalFileDataSource {
     fun saveTextToDisk(filepath: String, contents: String)
 
     fun exportDataToCSV(
-        fileName: String, dataList: List<HemoCubeTestData>
+        fileName: String, dataList: List<HemoCubeTestData>,
     ): Boolean
 }

app/src/main/java/com/example/hpostesting/data/datasource/LocalFileDataSourceImpl.kt

@@ -8,7 +8,7 @@ import java.io.FileWriter
 import java.io.IOException
 import javax.inject.Inject
 
-class LocalFileDataSourceImpl @Inject constructor(): LocalFileDataSource {
+class LocalFileDataSourceImpl @Inject constructor() : LocalFileDataSource {
 
     override fun saveCsvToDisk(filepath: String, contents: ArrayList<Array<String>>) {
         val writer = CSVWriter(FileWriter(filepath))
@@ -25,10 +25,13 @@ class LocalFileDataSourceImpl @Inject constructor(): LocalFileDataSource {
     }
 
     override fun exportDataToCSV(
-        fileName: String, dataList: List<HemoCubeTestData>
+        fileName: String, dataList: List<HemoCubeTestData>,
     ): Boolean {
         try {
-            val formattedFileName = fileName.replace(Regex("[^a-zA-Z0-9.-]"), "_") // Replace special characters with underscores
+            val formattedFileName = fileName.replace(
+                Regex("[^a-zA-Z0-9.-]"),
+                "_"
+            ) // Replace special characters with underscores
             val filePath = File(getExternalStorageDirectory(), formattedFileName)
             val writer = FileWriter(filePath)
             val csvWriter = CSVWriter(writer)

app/src/main/java/com/example/hpostesting/data/model/devicediagnostics/AdditionalDetails.kt

@@ -0,0 +1,14 @@
+package com.example.hpostesting.data.model.devicediagnostics
+
+data class AdditionalDetails(
+     val batteryLevel: String? = "",
+     val batteryCapacity: String? = "",
+     val batteryMaxCapacity: String? = "",
+     val batteryTemperature: String? = "",
+     val batteryVoltage: String? = "",
+)
+
+
+
+
+

app/src/main/java/com/example/hpostesting/data/model/devicediagnostics/DeviceDiagnosticsData.kt

@@ -0,0 +1,12 @@
+package com.example.hpostesting.data.model.devicediagnostics
+
+data class DeviceDiagnosticsData(
+    val id: String? = "",
+    val deviceId: String? = "",
+    val additionalDetails: AdditionalDetails?= AdditionalDetails(),
+    val createdBy: String? = "",
+    val updatedBy: String? = "",
+    val updatedAt: String? = "",
+    val createdAt: String? = "",
+)
+

app/src/main/java/com/example/hpostesting/data/model/devicediagnostics/DeviceDiagnosticsRequest.kt

@@ -0,0 +1,5 @@
+package com.example.hpostesting.data.model.devicediagnostics
+
+data class DeviceDiagnosticsRequest(
+    val additionalDetails: AdditionalDetails?= AdditionalDetails()
+)

app/src/main/java/com/example/hpostesting/data/model/devicediagnostics/DeviceDiagnosticsResponse.kt

@@ -0,0 +1,11 @@
+package com.example.hpostesting.data.model.devicediagnostics
+
+import com.google.gson.annotations.SerializedName
+
+
+data class DeviceDiagnosticsResponse(
+    @SerializedName("Data")
+    val data: DeviceDiagnosticsData? = DeviceDiagnosticsData(),
+    val message: String? = "",
+    val result: String? = ""
+)

app/src/main/java/com/example/hpostesting/data/model/deviceprovision/Credentials.kt

@@ -2,5 +2,5 @@ package com.example.hpostesting.data.model.deviceprovision
 
 data class Credentials(
     val password: String? = "",
-    val username: String? = ""
+    val username: String? = "",
 )

app/src/main/java/com/example/hpostesting/data/model/deviceprovision/Device.kt

@@ -13,5 +13,5 @@ data class Device(
     val serialNumber: String? = "",
     val uid: String? = "",
     val updatedAt: String? = "",
-    val updatedBy: Int? = 0
+    val updatedBy: Int? = 0,
 )

app/src/main/java/com/example/hpostesting/data/model/deviceprovision/DeviceProvisionData.kt

@@ -2,5 +2,5 @@ package com.example.hpostesting.data.model.deviceprovision
 
 data class DeviceProvisionData(
     val credentials: Credentials? = Credentials(),
-    val device: Device? = Device()
+    val device: Device? = Device(),
 )

app/src/main/java/com/example/hpostesting/data/model/deviceprovision/DeviceProvisionRequest.kt

@@ -5,5 +5,5 @@ data class DeviceProvisionRequest(
     val email: String? = "",
     val password: String? = "",
     val serialNumber: String? = "",
-    val uid: String? = ""
+    val uid: String? = "",
 )

app/src/main/java/com/example/hpostesting/data/model/deviceprovision/DeviceProvisionResponse.kt

@@ -8,5 +8,5 @@ data class DeviceProvisionResponse(
     @SerializedName("Message")
     val message: String? = "",
     @SerializedName("Result")
-    val result: String? = ""
+    val result: String? = "",
 )

app/src/main/java/com/example/hpostesting/data/model/deviceprovision/DeviceType.kt

@@ -8,5 +8,5 @@ data class DeviceType(
     val id: Int? = 0,
     val name: String? = "",
     val updatedAt: String? = "",
-    val updatedBy: Int? = 0
+    val updatedBy: Int? = 0,
 )

app/src/main/java/com/example/hpostesting/data/model/deviceprovision/DeviceUser.kt

@@ -11,5 +11,5 @@ data class DeviceUser(
     val natsTokenExpiry: String? = "",
     val updatedAt: String? = "",
     val updatedBy: Int? = 0,
-    val username: String? = ""
+    val username: String? = "",
 )

app/src/main/java/com/example/hpostesting/data/model/deviceprovision/ProvisionData.kt

@@ -1,8 +1,8 @@
 package com.example.hpostesting.data.model.deviceprovision
 
 data class ProvisionData(
-val username: String?,
-val password: String?,
-val natsToken: String?
+    val username: String?,
+    val password: String?,
+    val natsToken: String?,
 )
 

app/src/main/java/com/example/hpostesting/data/model/diagnostics/DiagnosticsData.kt

@@ -1,6 +1,6 @@
 package com.example.hpostesting.data.model.diagnostics
 
-data class DiagnosticsData (
+data class DiagnosticsData(
     var deviceId: String = "",
     var appVersion: String? = "",
     var deviceType: String = "HEMOCUBE",
@@ -8,5 +8,5 @@ data class DiagnosticsData (
     var devicePassword: String = "",
     var deviceNatsToken: String = "",
     var accessToken: String = "",
-    var runTime: String = ""
+    var runTime: String = "",
 )

app/src/main/java/com/example/hpostesting/data/model/jig/JigData.kt

@@ -1,9 +1,9 @@
 package com.example.hpostesting.data.model.jig
 
-data class JigData (
+data class JigData(
     var deviceId: String = "",
     var appVersion: String? = "",
     var deviceType: String = "JIG",
     var scanData: String = "",
-    var createdAt: String = ""
+    var createdAt: String = "",
 )

app/src/main/java/com/example/hpostesting/data/model/log/UploadLogsData.kt

@@ -1,5 +1,5 @@
 package com.example.hpostesting.data.model.log
 
 data class UploadLogsData(
-    val filename: String? = ""
+    val filename: String? = "",
 )

app/src/main/java/com/example/hpostesting/data/model/log/UploadLogsResponse.kt

@@ -8,5 +8,5 @@ data class UploadLogsResponse(
     @SerializedName("Message")
     val message: String? = "",
     @SerializedName("Result")
-    val result: String? = ""
+    val result: String? = "",
 )

app/src/main/java/com/example/hpostesting/data/model/login/Device.kt

@@ -12,5 +12,5 @@ data class Device(
     val serialNumber: String? = "",
     val uid: String? = "",
     val updatedAt: String? = "",
-    val updatedBy: Int? = 0
+    val updatedBy: Int? = 0,
 )

app/src/main/java/com/example/hpostesting/data/model/login/DeviceType.kt

@@ -8,5 +8,5 @@ data class DeviceType(
     val id: Int? = 0,
     val name: String? = "",
     val updatedAt: String? = "",
-    val updatedBy: Int? = 0
+    val updatedBy: Int? = 0,
 )

app/src/main/java/com/example/hpostesting/data/model/login/DeviceUser.kt

@@ -12,5 +12,5 @@ data class DeviceUser(
     val natsTokenExpiry: String? = "",
     val updatedAt: String? = "",
     val updatedBy: Int? = 0,
-    val username: String? = ""
+    val username: String? = "",
 )

app/src/main/java/com/example/hpostesting/data/model/login/LoginData.kt

@@ -2,5 +2,5 @@ package com.example.hpostesting.data.model.login
 
 data class LoginData(
     val accessToken: String? = "",
-    val deviceUser: DeviceUser? = DeviceUser()
+    val deviceUser: DeviceUser? = DeviceUser(),
 )

app/src/main/java/com/example/hpostesting/data/model/login/LoginRequest.kt

@@ -9,5 +9,5 @@ data class LoginRequest(
     val password: String? = "",
     val serialNumber: String? = "",
     val username: String? = "",
-    val version: String? = ""
+    val version: String? = "",
 )

app/src/main/java/com/example/hpostesting/data/model/login/LoginResponse.kt

@@ -8,5 +8,5 @@ data class LoginResponse(
     @SerializedName("Message")
     val message: String? = "",
     @SerializedName("Result")
-    val result: String? = ""
+    val result: String? = "",
 )

app/src/main/java/com/example/hpostesting/data/model/molbioresult/MolbioV2Result.kt

@@ -34,5 +34,5 @@ data class MolbioV2Result(
     val testType: String? = "",
     val thresholds: String? = "",
     val underMedication: Boolean? = false,
-    val volume: Int? = 2
+    val volume: Int? = 2,
 )

app/src/main/java/com/example/hpostesting/data/model/molbioresult/MolbioV2ResultData.kt

@@ -4,20 +4,20 @@ import com.example.hpostesting.data.model.patient.HemoCubeTestData
 
 data class MolbioV2ResultData(
     val age: Int? = 0,
-    val analysisDate: String? = "",
+    val analysisDate: String? = "2024-02-08 16:33:56",
     val analysisStatus: String? = "",
     val analysisType: String? = "",
     val analysisTypeMethod: String? = "",
     val bloodGroup: String? = "",
     val coefficients: List<Int>? = listOf(),
     val collectionLocation: List<Any>? = listOf(),
-    val collectionTime: String? = "",
+    val collectionTime: String? = "2024-02-08 16:33:56",
     val collector: String? = "",
     val createdAt: String? = "",
     val createdBy: Int? = 0,
     val curveFitting: String? = "",
     val deviceId: Int? = 0,
-    val expiryTime: String? = "",
+    val expiryTime: String? = "2024-02-08 16:33:56",
     val gender: String? = "",
     val id: Int? = 0,
     val interpretation: String? = "",
@@ -32,11 +32,11 @@ data class MolbioV2ResultData(
     val testId: String? = "",
     val testResult: String? = "",
     val testStatus: String? = "",
-    val testTime: String? = "",
+    val testTime: String? = "2024-02-08 16:33:56",
     val testType: String? = "",
     val thresholds: String? = "",
     val underMedication: Boolean? = false,
     val updatedAt: String? = "",
     val updatedBy: Int? = 0,
-    val volume: Int? = 0
+    val volume: Int? = 0,
 )

app/src/main/java/com/example/hpostesting/data/model/molbioresult/MolbioV2ResultRequest.kt

@@ -1,5 +1,5 @@
 package com.example.hpostesting.data.model.molbioresult
 
 data class MolbioV2ResultRequest(
-    val results: MutableList<MolbioV2Result>? = mutableListOf()
+    val results: MutableList<MolbioV2Result>? = mutableListOf(),
 )

app/src/main/java/com/example/hpostesting/data/model/molbioresult/MolbioV2ResultResponse.kt

@@ -8,5 +8,5 @@ data class MolbioV2ResultResponse(
     @SerializedName("Message")
     val message: String? = "",
     @SerializedName("Result")
-    val result: String? = ""
+    val result: String? = "",
 )

app/src/main/java/com/example/hpostesting/data/model/molbioresult/RawData.kt

@@ -19,7 +19,7 @@ data class RawData(
     var gender: String = "",
     var localFlag: Boolean = false,
     var deviceId: String? = "",
-    var appVersion:String? = "",
+    var appVersion: String? = "",
     var deviceSerialNumber: String = "",
     var deviceType: String = "HEMOCUBE",
     var kitSerial: String = "",

app/src/main/java/com/example/hpostesting/data/model/patient/BufferCheckData.kt

@@ -9,7 +9,7 @@ data class BufferCheckData(
     var _id: String = "",
     var kitno: String = "",
     var deviceId: String? = "",
-    var appVersion:String? = "",
+    var appVersion: String? = "",
     var deviceSerialNumber: String = "",
     var deviceType: String = "HEMOCUBE",
     var localFlag: Boolean = false,

app/src/main/java/com/example/hpostesting/data/model/patient/DeviceData.kt

@@ -15,9 +15,9 @@ data class DeviceData(
     @get:PropertyName("coefficients") @set:PropertyName("coefficients")
     var coefficients: List<Double> = emptyList(),
     @get:PropertyName("calibratedAt") @set:PropertyName("calibratedAt")
-    var calibratedAt: String = ""  ,
+    var calibratedAt: String = "",
     @get:PropertyName("deviceProvisionResponse") @set:PropertyName("deviceProvisionResponse")
-    var deviceProvisionResponse: String = "" ,
+    var deviceProvisionResponse: String = "",
     @get:PropertyName("username") @set:PropertyName("username")
     var username: String = "",
     @get:PropertyName("password") @set:PropertyName("password")
@@ -25,5 +25,5 @@ data class DeviceData(
     @get:PropertyName("natsToken") @set:PropertyName("natsToken")
     var natsToken: String = "",
     @get:PropertyName("natsTokenExpiry") @set:PropertyName("natsTokenExpiry")
-    var natsTokenExpiry: String = ""
+    var natsTokenExpiry: String = "",
 )

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

@@ -22,7 +22,7 @@ data class HemoCubeTestData(
     var gender: String = "",
     var localFlag: Boolean = false,
     var deviceId: String? = "",
-    var appVersion:String? = "",
+    var appVersion: String? = "",
     var deviceSerialNumber: String = "",
     var deviceType: String = "HEMOCUBE",
     var kitSerial: String = "",
@@ -89,5 +89,5 @@ data class HemoCubeTestData(
     var solution: String? = "",
     var concentration: String? = "",
     var volume: String? = "",
-    var isCSVCreated: Boolean = false
+    var isCSVCreated: Boolean = false,
 )

app/src/main/java/com/example/hpostesting/data/model/patient/PatientData.kt

@@ -18,7 +18,7 @@ data class PatientDetails(
     var address: Address?,
     var category: Category?,
     var registerDate: Date?,
-    var uploadDate: Date?
+    var uploadDate: Date?,
 ) {
     constructor() : this(
         "",
@@ -45,7 +45,6 @@ data class PatientDetails(
         OTHER
     }
 
-
     data class Address(
         var house: String?,
         val street: String?,

app/src/main/java/com/example/hpostesting/data/model/patient/UserData.kt

@@ -29,7 +29,7 @@ data class UserData(
     var reportPath: String = "",
     var result: TestRightResultType? = null,
     var resultRatio: Double? = null,
-    var prdClassification: String = ""
+    var prdClassification: String = "",
 ) {
     enum class Gender {
         MALE,
@@ -39,7 +39,7 @@ data class UserData(
 
     data class Location(
         var latitude: Double? = null,
-        var longitude: Double? = null
+        var longitude: Double? = null,
     )
 }
 

app/src/main/java/com/example/hpostesting/data/model/updates/CheckUpdateData.kt

@@ -1,5 +1,5 @@
 package com.example.hpostesting.data.model.updates
 
 data class CheckUpdateData(
-    val version: String? = ""
+    val version: String? = "",
 )

app/src/main/java/com/example/hpostesting/data/model/updates/CheckUpdateRequest.kt

@@ -1,5 +1,5 @@
 package com.example.hpostesting.data.model.updates
 
 data class CheckUpdateRequest(
-    val currentVersion: String? = ""
+    val currentVersion: String? = "",
 )

app/src/main/java/com/example/hpostesting/data/model/updates/CheckUpdateResponse.kt

@@ -8,5 +8,5 @@ data class CheckUpdateResponse(
     @SerializedName("Message")
     val message: String? = "",
     @SerializedName("Result")
-    val result: String? = ""
+    val result: String? = "",
 )

app/src/main/java/com/example/hpostesting/data/model/updates/DeviceUpdateRequest.kt

@@ -1,5 +1,5 @@
 package com.example.hpostesting.data.model.updates
 
 data class DeviceUpdateRequest(
-    val serial_no: String? = ""
+    val serial_no: String? = "",
 )

app/src/main/java/com/example/hpostesting/data/repository/DatabaseRepository.kt

@@ -6,6 +6,8 @@ import com.example.hpostesting.data.api.MolbioAuthApi
 import com.example.hpostesting.data.api.MolbioResultApi
 import com.example.hpostesting.data.model.PendingUploads
 import com.example.hpostesting.data.model.Response
+import com.example.hpostesting.data.model.devicediagnostics.DeviceDiagnosticsRequest
+import com.example.hpostesting.data.model.devicediagnostics.DeviceDiagnosticsResponse
 import com.example.hpostesting.data.model.deviceprovision.DeviceProvisionRequest
 import com.example.hpostesting.data.model.deviceprovision.DeviceProvisionResponse
 import com.example.hpostesting.data.model.diagnostics.DiagnosticsData
@@ -38,8 +40,8 @@ import javax.inject.Named
 
 class NetworkException(message: String, cause: Throwable) : Exception(message, cause)
 class DatabaseRepository @Inject constructor(
-    @Named("Auth")private val molbioAuthApi: MolbioAuthApi,
-    private val molbioResultApi: MolbioResultApi
+    @Named("Auth") private val molbioAuthApi: MolbioAuthApi,
+    private val molbioResultApi: MolbioResultApi,
 ) : Repository {
 
     private val db: FirebaseFirestore = Firebase.firestore
@@ -78,9 +80,14 @@ class DatabaseRepository @Inject constructor(
         return safeApiCall { molbioResultApi.deviceUpdate(deviceUpdateRequest) }
     }
 
+    override suspend fun deviceDiagnostics(deviceDiagnosticsRequest: DeviceDiagnosticsRequest): Result<DeviceDiagnosticsResponse> {
+        return safeApiCall { molbioResultApi.deviceDiagnostics(deviceDiagnosticsRequest) }
+    }
+
     override suspend fun downloadClientCertificate(): Result<ResponseBody> {
         return safeApiCall { molbioResultApi.downloadClientCertificate() }
     }
+
     override suspend fun uploadLogs(logFile: MultipartBody.Part): Result<UploadLogsResponse> {
         return safeApiCall { molbioResultApi.uploadLogs(logFile) }
     }
@@ -149,7 +156,7 @@ class DatabaseRepository @Inject constructor(
     }
 
     override suspend fun uploadFileToStorage(
-        patientID: String, filePath: String
+        patientID: String, filePath: String,
     ): Response<Boolean> {
         try {
 
@@ -240,5 +247,4 @@ class DatabaseRepository @Inject constructor(
     override fun <UserData> addTestToDatabase(testDetails: UserData): Any {
         TODO("Not yet implemented")
     }
-
 }

app/src/main/java/com/example/hpostesting/data/repository/Repository.kt

@@ -2,6 +2,8 @@ package com.example.hpostesting.data.repository
 
 import com.example.hpostesting.data.Result
 import com.example.hpostesting.data.model.Response
+import com.example.hpostesting.data.model.devicediagnostics.DeviceDiagnosticsRequest
+import com.example.hpostesting.data.model.devicediagnostics.DeviceDiagnosticsResponse
 import com.example.hpostesting.data.model.deviceprovision.DeviceProvisionRequest
 import com.example.hpostesting.data.model.deviceprovision.DeviceProvisionResponse
 import com.example.hpostesting.data.model.diagnostics.DiagnosticsData
@@ -49,7 +51,7 @@ interface Repository {
     suspend fun checkUpdate(checkUpdateRequest: CheckUpdateRequest): Result<CheckUpdateResponse>
 
     suspend fun deviceUpdate(deviceUpdateRequest: DeviceUpdateRequest): Result<ResponseBody>
-
+    suspend fun deviceDiagnostics(deviceDiagnosticsRequest: DeviceDiagnosticsRequest): Result<DeviceDiagnosticsResponse>
     suspend fun downloadClientCertificate(): Result<ResponseBody>
     suspend fun uploadLogs(logFile: MultipartBody.Part): Result<UploadLogsResponse>
 }

app/src/main/java/com/example/hpostesting/domain/SaveRawData.kt

@@ -1,10 +1,10 @@
 package com.example.hpostesting.domain
 
 import android.util.Log
-import com.example.hpostesting.data.repository.LocalFileRepository
 import com.example.hpostesting.data.constant.Constants
 import com.example.hpostesting.data.model.patient.UserData
 import com.example.hpostesting.data.model.test.TestRightCalculationData
+import com.example.hpostesting.data.repository.LocalFileRepository
 import java.util.Collections.sort
 
 class SaveRawData(private val localFileRepository: LocalFileRepository) {
@@ -98,7 +98,7 @@ class SaveRawData(private val localFileRepository: LocalFileRepository) {
         folderPath: String,
         fileName: String,
         calculationData: TestRightCalculationData,
-        testDetails: UserData?
+        testDetails: UserData?,
     ) {
 //        val fileObj = File(folderPath, fileName)
 //        val writer = FileWriter(fileObj)
@@ -116,7 +116,7 @@ class SaveRawData(private val localFileRepository: LocalFileRepository) {
 
     private fun getLogStringFromObjWithPatientData(
         calculationData: TestRightCalculationData,
-        testDetails: UserData?
+        testDetails: UserData?,
     ): String {
         var outputString = "Test calculation logs ==>\n"
         outputString += "Name = ${testDetails?.name}\n"

app/src/main/java/com/example/hpostesting/presentation/KitScanActivity.kt

@@ -87,7 +87,7 @@ class KitScanActivity : AppCompatActivity(), IDcsSdkApiDelegate {
 
     override fun dcssdkEventAuxScannerAppeared(
         dcsScannerInfo: DCSScannerInfo?,
-        dcsScannerInfo1: DCSScannerInfo?
+        dcsScannerInfo1: DCSScannerInfo?,
     ) {
     }
 
@@ -119,7 +119,6 @@ class KitScanActivity : AppCompatActivity(), IDcsSdkApiDelegate {
 //            }
 //        }
 
-
         try {
             if (checkHemoCubeKitData()) {
                 DataHolder.selectedTest!!.kitSerial =
@@ -156,7 +155,6 @@ class KitScanActivity : AppCompatActivity(), IDcsSdkApiDelegate {
             pullTrigger()
         }
 
-
         binding.btnGo.setOnClickListener {
             val serialNumber = binding.nameEditText.text.toString().trim()
             if (serialNumber.isNotEmpty() && isSerialValid(serialNumber)) {
@@ -223,11 +221,11 @@ class KitScanActivity : AppCompatActivity(), IDcsSdkApiDelegate {
             notifications_mask or DCSSDKDefs.DCSSDK_EVENT.DCSSDK_EVENT_BARCODE.value
         sdkHandler!!.dcssdkSubsribeForEvents(notifications_mask)
         mScannerInfoList.addAll(sdkHandler!!.dcssdkGetAvailableScannersList())
-        Log.e("scannersize",sdkHandler!!.dcssdkGetAvailableScannersList().size.toString())
+        Log.e("scannersize", sdkHandler!!.dcssdkGetAvailableScannersList().size.toString())
         if (mScannerInfoList.isNotEmpty()) {
             sdkHandler!!.dcssdkEstablishCommunicationSession(mScannerInfoList[0].scannerID)
         } else {
-            Toast.makeText(this,"Error", Toast.LENGTH_LONG).show()
+            Toast.makeText(this,"Scanner Is not available In this device", Toast.LENGTH_LONG).show()
         }
     }
 
@@ -242,7 +240,10 @@ class KitScanActivity : AppCompatActivity(), IDcsSdkApiDelegate {
             val outXML = StringBuilder()
             val result: DCSSDK_RESULT =
                 sdkHandler!!.dcssdkExecuteCommandOpCodeInXMLForScanner(
-                    DCSSDK_COMMAND_OPCODE.DCSSDK_DEVICE_PULL_TRIGGER, inXML, outXML, mScannerInfoList[0].scannerID // Ensure you're using the correct scanner ID
+                    DCSSDK_COMMAND_OPCODE.DCSSDK_DEVICE_PULL_TRIGGER,
+                    inXML,
+                    outXML,
+                    mScannerInfoList[0].scannerID // Ensure you're using the correct scanner ID
                 )
             if (result == DCSSDK_RESULT.DCSSDK_RESULT_SUCCESS) {
                 Log.d("Scanning", "Success")
@@ -255,7 +256,6 @@ class KitScanActivity : AppCompatActivity(), IDcsSdkApiDelegate {
         }
     }
 
-
     //this function is called if barcode is detected.
     override fun dcssdkEventBarcode(barcodeData: ByteArray?, barcodeType: Int, fromScannerID: Int) {
         val result = String(barcodeData!!)

app/src/main/java/com/example/hpostesting/presentation/MainActivity.kt

@@ -111,7 +111,11 @@ class MainActivity : AppCompatActivity() {
         val deviceType = when {
             availableDrivers.isNotEmpty() -> {
                 val device = availableDrivers[0].device
-                Toast.makeText(this, "Connected, productId: ${device.productId}, vendorId: ${device.vendorId}", Toast.LENGTH_SHORT).show()
+                Toast.makeText(
+                    this,
+                    "Connected, productId: ${device.productId}, vendorId: ${device.vendorId}",
+                    Toast.LENGTH_SHORT
+                ).show()
                 when {
                     device.productId == Constants.HOMO_CUBE_ID && device.vendorId == Constants.VENDOR_ID -> {
                         binding.cvItem1.visibility = View.VISIBLE
@@ -348,7 +352,7 @@ class MainActivity : AppCompatActivity() {
     }
 
     override fun onRequestPermissionsResult(
-        requestCode: Int, permissions: Array<String>, grantResults: IntArray
+        requestCode: Int, permissions: Array<String>, grantResults: IntArray,
     ) {
         super.onRequestPermissionsResult(requestCode, permissions, grantResults)
         when (requestCode) {

app/src/main/java/com/example/hpostesting/presentation/SplashActivity.kt

@@ -1,6 +1,5 @@
 package com.example.hpostesting.presentation
 
-import com.example.hpostesting.presentation.dashboard.DashboardActivity
 import android.Manifest
 import android.content.Context
 import android.content.Intent
@@ -16,6 +15,7 @@ import androidx.appcompat.app.AppCompatActivity
 import androidx.core.content.ContextCompat
 import com.example.hpostesting.data.DataHolder
 import com.example.hpostesting.data.constant.LanguageManager
+import com.example.hpostesting.presentation.dashboard.DashboardActivity
 import com.example.hpostesting.util.MyUtils
 import `in`.sminnovations.hpostesting.R
 import `in`.sminnovations.hpostesting.databinding.ActivitySplashBinding
@@ -53,7 +53,10 @@ class SplashActivity : AppCompatActivity() {
 
     private fun setupStaticConstants() {
         DataHolder.mobileUniqueId =
-            Settings.Secure.getString(applicationContext.contentResolver, Settings.Secure.ANDROID_ID)
+            Settings.Secure.getString(
+                applicationContext.contentResolver,
+                Settings.Secure.ANDROID_ID
+            )
     }
 
 //    private fun setupFirestoreCache() {
@@ -98,7 +101,10 @@ class SplashActivity : AppCompatActivity() {
     private fun requestPermissionsBelowAndroidR() {
         val permissionsToRequest = requiredPermissions
             .filterNot { permission ->
-                ContextCompat.checkSelfPermission(this, permission) == PackageManager.PERMISSION_GRANTED
+                ContextCompat.checkSelfPermission(
+                    this,
+                    permission
+                ) == PackageManager.PERMISSION_GRANTED
             }
             .toTypedArray()
 
@@ -114,9 +120,18 @@ class SplashActivity : AppCompatActivity() {
         val coarseLocationPermission = Manifest.permission.ACCESS_COARSE_LOCATION
         val cameraPermission = Manifest.permission.CAMERA
         val locationPermissionsGranted =
-            ContextCompat.checkSelfPermission(this, fineLocationPermission) == PackageManager.PERMISSION_GRANTED &&
-                    ContextCompat.checkSelfPermission(this, coarseLocationPermission) == PackageManager.PERMISSION_GRANTED
-        val cameraPermissionGranted = ContextCompat.checkSelfPermission(this, cameraPermission) == PackageManager.PERMISSION_GRANTED
+            ContextCompat.checkSelfPermission(
+                this,
+                fineLocationPermission
+            ) == PackageManager.PERMISSION_GRANTED &&
+                    ContextCompat.checkSelfPermission(
+                        this,
+                        coarseLocationPermission
+                    ) == PackageManager.PERMISSION_GRANTED
+        val cameraPermissionGranted = ContextCompat.checkSelfPermission(
+            this,
+            cameraPermission
+        ) == PackageManager.PERMISSION_GRANTED
 
         if (locationPermissionsGranted && cameraPermissionGranted) {
             handlePermissionsResult(true)

app/src/main/java/com/example/hpostesting/presentation/adapter/OfflineUserListAdapter.kt

@@ -17,13 +17,11 @@ import com.example.hpostesting.data.model.patient.HemoCubeTestData
 import com.example.hpostesting.data.model.patient.UserData
 import `in`.sminnovations.hpostesting.R
 import `in`.sminnovations.hpostesting.databinding.OfflineUserListViewBinding
-import org.apache.commons.collections4.MapUtils.getString
 import java.text.SimpleDateFormat
 import java.util.Calendar
 import java.util.Date
 import java.util.Locale
 
-
 class OfflineUserListAdapter(private val view: View, private val batLevel: Int) :
     RecyclerView.Adapter<OfflineUserListAdapter.OfflineUserListViewHolder>() {
 
@@ -33,13 +31,13 @@ class OfflineUserListAdapter(private val view: View, private val batLevel: Int)
 
     private val differCallback = object : DiffUtil.ItemCallback<HemoCubeTestData>() {
         override fun areItemsTheSame(
-            oldItem: HemoCubeTestData, newItem: HemoCubeTestData
+            oldItem: HemoCubeTestData, newItem: HemoCubeTestData,
         ): Boolean {
             return oldItem._id == newItem._id
         }
 
         override fun areContentsTheSame(
-            oldItem: HemoCubeTestData, newItem: HemoCubeTestData
+            oldItem: HemoCubeTestData, newItem: HemoCubeTestData,
         ): Boolean {
             return oldItem == newItem
         }
@@ -143,7 +141,6 @@ class OfflineUserListAdapter(private val view: View, private val batLevel: Int)
         return diffMillis / (60 * 1000)
     }
 
-
     private fun showWarningToast(resId: Int) {
         val contextToUse = view.context ?: return
 

app/src/main/java/com/example/hpostesting/presentation/adapter/UserListAdapter.kt

@@ -4,30 +4,28 @@ import android.annotation.SuppressLint
 import android.app.AlertDialog
 import android.content.Context
 import android.content.Context.INPUT_METHOD_SERVICE
-import android.view.inputmethod.InputMethodManager
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
+import android.view.inputmethod.InputMethodManager
+import android.widget.AutoCompleteTextView
 import android.widget.Toast
+import androidx.fragment.app.FragmentActivity
 import androidx.navigation.findNavController
 import androidx.recyclerview.widget.RecyclerView
 import com.bumptech.glide.Glide
 import com.example.hpostesting.data.DataHolder
 import com.example.hpostesting.data.model.patient.UserData
+import com.example.hpostesting.presentation.hemocube.HemoCubeViewModel
 import com.firebase.ui.firestore.FirestoreRecyclerAdapter
 import com.firebase.ui.firestore.FirestoreRecyclerOptions
+import com.google.firebase.firestore.FirebaseFirestore
 import `in`.sminnovations.hpostesting.R
 import `in`.sminnovations.hpostesting.databinding.UserItemViewBinding
 import java.text.SimpleDateFormat
 import java.util.Calendar
 import java.util.Date
 import java.util.Locale
-import android.widget.AutoCompleteTextView
-import androidx.core.content.ContextCompat.getSystemService
-import androidx.core.content.getSystemService
-import androidx.fragment.app.FragmentActivity
-import com.example.hpostesting.presentation.hemocube.HemoCubeViewModel
-import com.google.firebase.firestore.FirebaseFirestore
 
 class UserListAdapter(
 
@@ -36,7 +34,7 @@ class UserListAdapter(
     options: FirestoreRecyclerOptions<UserData>,
     private val view: View,
     private val batLevel: Int,
-    private val requireActivity: FragmentActivity
+    private val requireActivity: FragmentActivity,
 ) : FirestoreRecyclerAdapter<UserData, UserListAdapter.OrderItemViewHolder>(options) {
 
     class OrderItemViewHolder(val binding: UserItemViewBinding) :
@@ -96,16 +94,21 @@ class UserListAdapter(
                     .setView(dialogView)
                     .setTitle(R.string.blood_group)
 
-                val etBloodGroup = dialogView.findViewById<AutoCompleteTextView>(R.id.et_blood_group)
+                val etBloodGroup =
+                    dialogView.findViewById<AutoCompleteTextView>(R.id.et_blood_group)
 
                 builder.setPositiveButton(R.string.ok) { dialog, which ->
                     val bloodGroup = etBloodGroup.text.toString()
-                    if (bloodGroup.equals("Select Blood Group") ||bloodGroup.equals("ರಕ್ತ ಗುಂಪು ಆಯ್ಕೆಮಾಡಿ") || bloodGroup.isNullOrBlank()) {
+                    if (bloodGroup.equals("Select Blood Group") || bloodGroup.equals("ರಕ್ತ ಗುಂಪು ಆಯ್ಕೆಮಾಡಿ") || bloodGroup.isNullOrBlank()) {
                         if (view != null) {
-                            etBloodGroup.error =view.context.getString(R.string.blood_group_error)
+                            etBloodGroup.error = view.context.getString(R.string.blood_group_error)
                         }
                         if (view != null) {
-                            Toast.makeText(context, view.context.getString(R.string.blood_group_toast), Toast.LENGTH_SHORT).show()
+                            Toast.makeText(
+                                context,
+                                view.context.getString(R.string.blood_group_toast),
+                                Toast.LENGTH_SHORT
+                            ).show()
                         }
                     } else {
                         // Check if hemoCubeViewModel and testDetails are not null
@@ -119,7 +122,8 @@ class UserListAdapter(
                                     val document = userdata.documents[0]
                                     db.collection("patientData")
                                         .document(document.id)
-                                        .update("bloodGroup", bloodGroup,
+                                        .update(
+                                            "bloodGroup", bloodGroup,
                                             "incubationTime", SimpleDateFormat(
                                                 "yyyy-MM-dd HH:mm:ss", Locale.getDefault()
                                             ).format(Calendar.getInstance().time).toString()

app/src/main/java/com/example/hpostesting/presentation/assurance/AssuranceControlsActivity.kt

@@ -8,7 +8,7 @@ import dagger.hilt.android.AndroidEntryPoint
 import `in`.sminnovations.hpostesting.databinding.ActivityAssuranceControlsBinding
 
 @AndroidEntryPoint
-class AssuranceControlsActivity: AppCompatActivity() {
+class AssuranceControlsActivity : AppCompatActivity() {
     lateinit var binding: ActivityAssuranceControlsBinding
     lateinit var sharedPreference: SharedPreferences
 

app/src/main/java/com/example/hpostesting/presentation/assurance/AssuranceControlsFragment.kt

@@ -22,7 +22,7 @@ import com.example.hpostesting.presentation.hemocube.HemocubeActivity
 import `in`.sminnovations.hpostesting.databinding.FragmentAssuranceControlsBinding
 import java.time.Instant
 
-class AssuranceControlsFragment: Fragment() {
+class AssuranceControlsFragment : Fragment() {
     lateinit var binding: FragmentAssuranceControlsBinding
     private lateinit var sharedPreferences: SharedPreferences
 
@@ -48,7 +48,8 @@ class AssuranceControlsFragment: Fragment() {
 
         val solutionSpinner: Spinner = binding.spinnerSolutions
         val solutionOptions = arrayOf("Select solution", "Tartrazine", "Acid Red")
-        val solutionAdapter = ArrayAdapter(requireContext(), R.layout.simple_spinner_item, solutionOptions)
+        val solutionAdapter =
+            ArrayAdapter(requireContext(), R.layout.simple_spinner_item, solutionOptions)
         solutionAdapter.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item)
         solutionSpinner.adapter = solutionAdapter
         solutionSpinner.onItemSelectedListener = object : AdapterView.OnItemSelectedListener {
@@ -56,7 +57,7 @@ class AssuranceControlsFragment: Fragment() {
                 parent: AdapterView<*>?,
                 view: View?,
                 position: Int,
-                id: Long
+                id: Long,
             ) {
                 val selectedValue: String = solutionOptions[position]
                 if (!selectedValue.equals("Select solution")) {
@@ -69,8 +70,21 @@ class AssuranceControlsFragment: Fragment() {
         }
 
         val concentrationSpinner: Spinner = binding.spinnerConcentration
-        val concentrationOptions = arrayOf("Select concentration", "65umol", "45umol", "22.5umol", "12.25umol", "6.125umol", "75umol", "50umol", "25umol", "12.5umol", "6.25umol")
-        val concentrationAdapter = ArrayAdapter(requireContext(), R.layout.simple_spinner_item, concentrationOptions)
+        val concentrationOptions = arrayOf(
+            "Select concentration",
+            "65umol",
+            "45umol",
+            "22.5umol",
+            "12.25umol",
+            "6.125umol",
+            "75umol",
+            "50umol",
+            "25umol",
+            "12.5umol",
+            "6.25umol"
+        )
+        val concentrationAdapter =
+            ArrayAdapter(requireContext(), R.layout.simple_spinner_item, concentrationOptions)
         concentrationAdapter.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item)
         concentrationSpinner.adapter = concentrationAdapter
         concentrationSpinner.onItemSelectedListener = object : AdapterView.OnItemSelectedListener {
@@ -78,7 +92,7 @@ class AssuranceControlsFragment: Fragment() {
                 parent: AdapterView<*>?,
                 view: View?,
                 position: Int,
-                id: Long
+                id: Long,
             ) {
                 val selectedValue: String = concentrationOptions[position]
                 if (!selectedValue.equals("Select concentration")) {
@@ -92,7 +106,8 @@ class AssuranceControlsFragment: Fragment() {
 
         val volumeSpinner: Spinner = binding.spinnerVolume
         val volumeOptions = arrayOf("Select volume", "1uml", "2uml", "4uml", "4.5uml", "5uml")
-        val volumeAdapter = ArrayAdapter(requireContext(), R.layout.simple_spinner_item, volumeOptions)
+        val volumeAdapter =
+            ArrayAdapter(requireContext(), R.layout.simple_spinner_item, volumeOptions)
         volumeAdapter.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item)
         volumeSpinner.adapter = volumeAdapter
         volumeSpinner.onItemSelectedListener = object : AdapterView.OnItemSelectedListener {
@@ -100,7 +115,7 @@ class AssuranceControlsFragment: Fragment() {
                 parent: AdapterView<*>?,
                 view: View?,
                 position: Int,
-                id: Long
+                id: Long,
             ) {
                 val selectedValue: String = volumeOptions[position]
             }
@@ -110,12 +125,15 @@ class AssuranceControlsFragment: Fragment() {
         }
 
         // load saved values
-        val savedSolution = sharedPreferences.getString(Constants.QUICK_CAPTURE_SOLUTION, "").toString()
+        val savedSolution =
+            sharedPreferences.getString(Constants.QUICK_CAPTURE_SOLUTION, "").toString()
         val solutionPosition = getPositionOfValue(savedSolution, solutionOptions.toList())
         solutionSpinner.setSelection(solutionPosition)
 
-        val savedConcentration = sharedPreferences.getString(Constants.QUICK_CAPTURE_CONCENTRATION, "").toString()
-        val concentrationPosition = getPositionOfValue(savedConcentration, concentrationOptions.toList())
+        val savedConcentration =
+            sharedPreferences.getString(Constants.QUICK_CAPTURE_CONCENTRATION, "").toString()
+        val concentrationPosition =
+            getPositionOfValue(savedConcentration, concentrationOptions.toList())
         concentrationSpinner.setSelection(concentrationPosition)
 
         val savedVolume = sharedPreferences.getString(Constants.QUICK_CAPTURE_VOLUME, "").toString()
@@ -143,6 +161,8 @@ class AssuranceControlsFragment: Fragment() {
                 ""
             }
             DataHolder.hemoCubeTestData!!._id = currentUnixTime.toString() + "SMI"
+            DataHolder.hemoCubeTestData!!.solution = binding.spinnerSolutions.selectedItem.toString()
+            DataHolder.hemoCubeTestData!!.concentration = binding.spinnerConcentration.selectedItem.toString()
             DataHolder.hemoCubeTestData!!.name = "${DataHolder.hemoCubeTestData!!.solution} ${DataHolder.hemoCubeTestData!!.concentration} ${DataHolder.hemoCubeTestData!!.volume}"
 
             DataHolder.selectedTest = UserData()
@@ -151,7 +171,10 @@ class AssuranceControlsFragment: Fragment() {
 
             with(sharedPreferences.edit()) {
                 putString(Constants.QUICK_CAPTURE_SOLUTION, DataHolder.hemoCubeTestData!!.solution)
-                putString(Constants.QUICK_CAPTURE_CONCENTRATION, DataHolder.hemoCubeTestData!!.concentration)
+                putString(
+                    Constants.QUICK_CAPTURE_CONCENTRATION,
+                    DataHolder.hemoCubeTestData!!.concentration
+                )
                 putString(Constants.QUICK_CAPTURE_VOLUME, DataHolder.hemoCubeTestData!!.volume)
                 apply()
             }

app/src/main/java/com/example/hpostesting/presentation/autodac/AutoDacActivity.kt

@@ -31,7 +31,7 @@ import `in`.sminnovations.hpostesting.R
 import `in`.sminnovations.hpostesting.databinding.ActivityAutoDacBinding
 
 @AndroidEntryPoint
-class AutoDacActivity: AppCompatActivity()  {
+class AutoDacActivity : AppCompatActivity() {
     private lateinit var binding: ActivityAutoDacBinding
     val viewModel: AutoDacViewModel by viewModels()
     private var myMenu: Menu? = null
@@ -58,11 +58,9 @@ class AutoDacActivity: AppCompatActivity()  {
                     DataHolder.usbConnected.postValue(true)
                 }
             }
-
         }
     }
 
-
     private val connection = object : ServiceConnection {
         override fun onServiceConnected(className: ComponentName, service: IBinder) {
             val binder = service as UsbService.UsbServiceBinder
@@ -107,6 +105,7 @@ class AutoDacActivity: AppCompatActivity()  {
             }
         }
     }
+
     open fun connectUsb(permissionGranted: Boolean) {
         Log.d(TAG, "connectUsb() called, permission variable = $permissionGranted")
         val manager = getSystemService(Context.USB_SERVICE) as UsbManager
@@ -126,7 +125,6 @@ class AutoDacActivity: AppCompatActivity()  {
         }
     }
 
-
     fun onErrorReported(msg: String) {
         Toast.makeText(this, msg, Toast.LENGTH_SHORT).show()
         if (!isFinishing) onBackPressed()
@@ -161,17 +159,16 @@ class AutoDacActivity: AppCompatActivity()  {
         manager.requestPermission(device, mPendingIntent)
     }
 
-
     fun setupService() {
         val intent = Intent(this, UsbService::class.java)
         bindService(intent, connection, Context.BIND_AUTO_CREATE)
     }
 
-
     override fun onCreateOptionsMenu(menu: Menu?): Boolean {
         menuInflater.inflate(R.menu.my_menu, menu)
         return true
     }
+
     override fun onDestroy() {
         super.onDestroy()
         if (viewModel.isServiceConnected) {

app/src/main/java/com/example/hpostesting/presentation/autodac/AutoDacFragment.kt

@@ -22,7 +22,7 @@ import java.text.SimpleDateFormat
 import java.util.Calendar
 import java.util.Locale
 
-class AutoDacFragment: Fragment() {
+class AutoDacFragment : Fragment() {
 
     private lateinit var binding: FragmentAutoDacBinding
     private val autoDacViewModel: AutoDacViewModel by activityViewModels()
@@ -47,7 +47,6 @@ class AutoDacFragment: Fragment() {
         observeViewModel()
     }
 
-
     private fun initViews() {
         binding.btnSubmit.visibility = View.GONE
         listenToHemoCube()
@@ -56,8 +55,11 @@ class AutoDacFragment: Fragment() {
             binding.btnSubmit.visibility = View.GONE
             runAutoDacCommand()
         }
+        binding.btnReadDac.setOnClickListener {
+            binding.btnReadDac.visibility = View.GONE
+            readCurrentDACValuesCommand()
+        }
     }
-
 
     private fun observeViewModel() {
 
@@ -93,6 +95,7 @@ class AutoDacFragment: Fragment() {
                         binding.tvSubtitle4.text = stringData
                     }
                 }
+
                 override fun onUsbError(e: Exception?) {
                     autoDacViewModel.progressBar.postValue(false)
                 }
@@ -106,6 +109,35 @@ class AutoDacFragment: Fragment() {
             object : UsbServiceListener {
                 override fun onUsbRead(data: ByteArray?) {
                 }
+
+                override fun onUsbError(e: Exception?) {
+                    autoDacViewModel.progressBar.postValue(false)
+                }
+            })
+    }
+
+    private fun setAutoDacValuesCommand() {
+        autoDacViewModel.progressBar.postValue(true)
+        (activity as AutoDacActivity).mService.sendAndListenToHemoCube(
+            HemoCubeCommands.SET_AUTO_DAC_TO_EPROM_COMMAND,
+            object : UsbServiceListener {
+                override fun onUsbRead(data: ByteArray?) {
+                }
+
+                override fun onUsbError(e: Exception?) {
+                    autoDacViewModel.progressBar.postValue(false)
+                }
+            })
+    }
+
+    private fun readCurrentDACValuesCommand() {
+        autoDacViewModel.progressBar.postValue(true)
+        (activity as AutoDacActivity).mService.sendAndListenToHemoCube(
+            HemoCubeCommands.READ_DAC_COMMAND,
+            object : UsbServiceListener {
+                override fun onUsbRead(data: ByteArray?) {
+                }
+
                 override fun onUsbError(e: Exception?) {
                     autoDacViewModel.progressBar.postValue(false)
                 }
@@ -143,12 +175,24 @@ class AutoDacFragment: Fragment() {
                     }
 
                     if (resultData.contains("#CC")) {
+                        setAutoDacValuesCommand()
+
                         autoDacViewModel.addAutoDacDataToDb(
                             DiagnosticsData(
-                                deviceId = sharedPreferences.getString(Constants.DEVICE_ID, "").toString(),
-                                devicePassword = sharedPreferences.getString(Constants.DEVICE_PASSWORD_API, "").toString(),
-                                deviceNatsToken = sharedPreferences.getString(Constants.NATS_TOKEN, "").toString(),
-                                accessToken = sharedPreferences.getString(Constants.ACCESS_TOKEN, "").toString(),
+                                deviceId = sharedPreferences.getString(Constants.DEVICE_ID, "")
+                                    .toString(),
+                                devicePassword = sharedPreferences.getString(
+                                    Constants.DEVICE_PASSWORD_API,
+                                    ""
+                                ).toString(),
+                                deviceNatsToken = sharedPreferences.getString(
+                                    Constants.NATS_TOKEN,
+                                    ""
+                                ).toString(),
+                                accessToken = sharedPreferences.getString(
+                                    Constants.ACCESS_TOKEN,
+                                    ""
+                                ).toString(),
                                 deviceData = resultData,
                                 runTime = SimpleDateFormat(
                                     "yyyy-MM-dd HH:mm:ss", Locale.getDefault()
@@ -159,6 +203,10 @@ class AutoDacFragment: Fragment() {
                             binding.ivCheck.visibility = View.VISIBLE
                         }
                     }
+
+                    if (resultData.contains("#WC")) {
+                        showToast("DAC Values saved to EPROM")
+                    }
                 }
 
                 override fun onUsbError(e: Exception?) {

app/src/main/java/com/example/hpostesting/presentation/autodac/AutoDacViewModel.kt

@@ -2,12 +2,9 @@ package com.example.hpostesting.presentation.autodac
 
 import android.content.Context
 import android.content.SharedPreferences
-import android.util.Log
-import androidx.lifecycle.LiveData
 import androidx.lifecycle.MutableLiveData
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
-import com.example.hpostesting.data.NetworkStatusLiveData
 import com.example.hpostesting.data.dao.HemoCubeDao
 import com.example.hpostesting.data.model.Response
 import com.example.hpostesting.data.model.diagnostics.DiagnosticsData
@@ -21,7 +18,7 @@ import javax.inject.Inject
 class AutoDacViewModel @Inject constructor(
     private val hemoCubeDao: HemoCubeDao,
     private val repository: Repository,
-    context: Context
+    context: Context,
 ) : ViewModel() {
     var isServiceConnected = false
     val progressBar = MutableLiveData(false)

app/src/main/java/com/example/hpostesting/presentation/blank/BlankActivity.kt

@@ -0,0 +1,4 @@
+package com.example.hpostesting.presentation.blank
+
+class BlankActivity {
+}

app/src/main/java/com/example/hpostesting/presentation/blank/BlankFragment.kt

@@ -0,0 +1,4 @@
+package com.example.hpostesting.presentation.blank
+
+class BlankFragment {
+}

app/src/main/java/com/example/hpostesting/presentation/blank/BlankViewModel.kt

@@ -0,0 +1,4 @@
+package com.example.hpostesting.presentation.blank
+
+class BlankViewModel {
+}

app/src/main/java/com/example/hpostesting/presentation/buffercheck/HemoCubeBufferCheckFragment.kt

@@ -142,6 +142,10 @@ class HemoCubeBufferCheckFragment : Fragment() {
         hemoCubeViewModel.messages.observe(viewLifecycleOwner) {
             binding.tvSubtitle4.text = it
         }
+
+        hemoCubeViewModel.deviceMessages.observe(viewLifecycleOwner) {
+            binding.tvDeviceMessages.text = it
+        }
     }
 
     private fun checkAndStartProcess() {
@@ -175,6 +179,7 @@ class HemoCubeBufferCheckFragment : Fragment() {
         }
 
         resultData += stringData
+        hemoCubeViewModel.deviceMessages.postValue(resultData)
 
         when {
             stringData.contains("SN") -> {
@@ -201,8 +206,9 @@ class HemoCubeBufferCheckFragment : Fragment() {
             stringData.contains("#BC") -> {
                 activity?.runOnUiThread {
                     binding.tvSubtitle4.text = "Buffer Completed"
-                    binding.btnSamplestart.visibility = View.VISIBLE
+//                    binding.btnSamplestart.visibility = View.VISIBLE
                 }
+                fetchResult()
             }
 
             stringData.contains("#SS") -> {
@@ -218,9 +224,9 @@ class HemoCubeBufferCheckFragment : Fragment() {
             }
 
             resultData.contains("REND") -> {
-                hemoCubeViewModel.messages.postValue(
-                    "Data collected \n" + " Processing data"
-                )
+//                hemoCubeViewModel.messages.postValue(
+//                    "Data collected \n" + " Processing data"
+//                )
                 val resultLines = resultData.split("\\s+(?=LB|LS)".toRegex())
                 var bufferIntensity = resultLines[1].split(' ')[1].trim()
                 led1BufferForDevice = bufferIntensity.toDoubleOrNull()!!
@@ -242,7 +248,7 @@ class HemoCubeBufferCheckFragment : Fragment() {
 
     private fun processResult() {
         try {
-            hemoCubeViewModel.messages.postValue("processing result")
+//            hemoCubeViewModel.messages.postValue("processing result")
             val deviceLog = resultData
 
             val pInfo = requireActivity().packageManager.getPackageInfo(

app/src/main/java/com/example/hpostesting/presentation/buffercheck/HemocubeBufferCheckActivity.kt

@@ -61,6 +61,7 @@ open class HemocubeBufferCheckActivity : AppCompatActivity() {
 
         }
     }
+
     private val connection = object : ServiceConnection {
         override fun onServiceConnected(className: ComponentName, service: IBinder) {
             val binder = service as UsbService.UsbServiceBinder
@@ -127,7 +128,8 @@ open class HemocubeBufferCheckActivity : AppCompatActivity() {
 
     @SuppressLint("MutableImplicitPendingIntent")
     private fun requestUserPermission(manager: UsbManager, device: UsbDevice) {
-        val mPendingIntent: PendingIntent = if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.S) {
+        val mPendingIntent: PendingIntent =
+            if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.S) {
                 PendingIntent.getBroadcast(
                     this, 0, Intent(Constants.HEMOCUBE_USB_PERMISSION), PendingIntent.FLAG_MUTABLE
                 )
@@ -153,7 +155,8 @@ open class HemocubeBufferCheckActivity : AppCompatActivity() {
     private fun moveToNext() {
         if (supportFragmentManager.isDestroyed) return
 
-        supportFragmentManager.beginTransaction().replace(binding.fghemocube.id, HemoCubeBufferCheckFragment())
+        supportFragmentManager.beginTransaction()
+            .replace(binding.fghemocube.id, HemoCubeBufferCheckFragment())
             .commit()
     }
 

app/src/main/java/com/example/hpostesting/presentation/calibration/CalibrationActivity.kt

@@ -31,7 +31,7 @@ import `in`.sminnovations.hpostesting.R
 import `in`.sminnovations.hpostesting.databinding.ActivityCalibrationBinding
 
 @AndroidEntryPoint
-class CalibrationActivity: AppCompatActivity()  {
+class CalibrationActivity : AppCompatActivity() {
     private lateinit var binding: ActivityCalibrationBinding
     val viewModel: CalibrationViewModel by viewModels()
     private var myMenu: Menu? = null
@@ -107,6 +107,7 @@ class CalibrationActivity: AppCompatActivity()  {
             }
         }
     }
+
     open fun connectUsb(permissionGranted: Boolean) {
         Log.d(TAG, "connectUsb() called, permission variable = $permissionGranted")
         val manager = getSystemService(Context.USB_SERVICE) as UsbManager
@@ -136,13 +137,15 @@ class CalibrationActivity: AppCompatActivity()  {
     private fun moveToNext() {
         if (supportFragmentManager.isDestroyed) return
 
-        supportFragmentManager.beginTransaction().replace(binding.fgCalibration.id, CalibrationFragment())
+        supportFragmentManager.beginTransaction()
+            .replace(binding.fgCalibration.id, CalibrationFragment())
             .commit()
     }
 
     @SuppressLint("MutableImplicitPendingIntent")
     private fun requestUserPermission(manager: UsbManager, device: UsbDevice) {
-        val mPendingIntent: PendingIntent = if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.S) {
+        val mPendingIntent: PendingIntent =
+            if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.S) {
                 PendingIntent.getBroadcast(
                     this, 0, Intent(Constants.HEMOCUBE_USB_PERMISSION), PendingIntent.FLAG_MUTABLE
                 )
@@ -160,17 +163,16 @@ class CalibrationActivity: AppCompatActivity()  {
         manager.requestPermission(device, mPendingIntent)
     }
 
-
     fun setupService() {
         val intent = Intent(this, UsbService::class.java)
         bindService(intent, connection, Context.BIND_AUTO_CREATE)
     }
 
-
     override fun onCreateOptionsMenu(menu: Menu?): Boolean {
         menuInflater.inflate(R.menu.my_menu, menu)
         return true
     }
+
     override fun onDestroy() {
         super.onDestroy()
         if (viewModel.isServiceConnected) {

app/src/main/java/com/example/hpostesting/presentation/calibration/CalibrationFragment.kt

@@ -23,7 +23,7 @@ import com.google.firebase.crashlytics.ktx.crashlytics
 import com.google.firebase.ktx.Firebase
 import `in`.sminnovations.hpostesting.databinding.FragmentCalibrationBinding
 
-class CalibrationFragment: Fragment() {
+class CalibrationFragment : Fragment() {
 
     private lateinit var binding: FragmentCalibrationBinding
     private val calibrationViewModel: CalibrationViewModel by activityViewModels()
@@ -50,7 +50,6 @@ class CalibrationFragment: Fragment() {
         loadSavedCalibration()
     }
 
-
     private fun initViews() {
         binding.btnSubmit.visibility = View.GONE
         listenToHemoCube()
@@ -226,6 +225,7 @@ class CalibrationFragment: Fragment() {
                         binding.tvSubtitle4.text = stringData
                     }
                 }
+
                 override fun onUsbError(e: Exception?) {
                     calibrationViewModel.progressBar.postValue(false)
                 }

app/src/main/java/com/example/hpostesting/presentation/calibration/CalibrationViewModel.kt

@@ -2,21 +2,12 @@ package com.example.hpostesting.presentation.calibration
 
 import android.content.Context
 import android.content.SharedPreferences
-import android.util.Log
-import androidx.lifecycle.LiveData
 import androidx.lifecycle.MutableLiveData
 import androidx.lifecycle.ViewModel
-import androidx.lifecycle.viewModelScope
-import com.example.hpostesting.data.NetworkStatusLiveData
-import com.example.hpostesting.data.constant.Constants
-import com.example.hpostesting.data.dao.HemoCubeDao
-import com.example.hpostesting.data.model.Response
 import com.example.hpostesting.data.model.calibration.CalibrationData
-import com.example.hpostesting.data.model.diagnostics.DiagnosticsData
 import com.example.hpostesting.data.model.patient.DeviceData
 import com.example.hpostesting.data.repository.Repository
 import dagger.hilt.android.lifecycle.HiltViewModel
-import kotlinx.coroutines.launch
 import javax.inject.Inject
 
 @HiltViewModel
@@ -30,12 +21,8 @@ class CalibrationViewModel  @Inject constructor(
     private val sharedPreference: SharedPreferences =
         context.getSharedPreferences("HEMOCUBE", Context.MODE_PRIVATE)
 
-//    private val _networkStatusLiveData = NetworkStatusLiveData(context)
     val deviceData = MutableLiveData<DeviceData?>()
-//    val networkStatusLiveData: LiveData<Boolean>
-//        get() = _networkStatusLiveData
     val fireBaseUpload = MutableLiveData<String>()
-    val savedCalibrationData = MutableLiveData<String>()
 
     fun loadSavedCalibrationData(): CalibrationData {
         val calibrationData = CalibrationData()

app/src/main/java/com/example/hpostesting/presentation/dashboard/DashboardActivity.kt

@@ -116,7 +116,6 @@ class DashboardActivity : AppCompatActivity(), IDataCollector {
             }
         }
 
-
         val drawerLayout: DrawerLayout = binding.drawerLayout
         val navView: NavigationView = binding.navView
         val navController = findNavController(R.id.nav_host_fragment_content_dashboard)

app/src/main/java/com/example/hpostesting/presentation/dashboard/GalleryFragment.kt

@@ -27,6 +27,7 @@ class GalleryFragment : Fragment() {
     private var _binding: FragmentGalleryBinding? = null
     private lateinit var sharedPreferences: SharedPreferences
     private var userid = ""
+
     // This property is only valid between onCreateView and
     // onDestroyView.
     private val binding get() = _binding!!
@@ -37,7 +38,7 @@ class GalleryFragment : Fragment() {
 
     @SuppressLint("SetTextI18n")
     override fun onCreateView(
-        inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?
+        inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?,
     ): View {
 //        val galleryViewModel =
 //            ViewModelProvider(this).get(GalleryViewModel::class.java)

app/src/main/java/com/example/hpostesting/presentation/dashboard/HomeFragment.kt

@@ -136,20 +136,23 @@ class HomeFragment : Fragment() {
             if (isConnected) {
                 binding.internetAvailableCL.visibility = View.VISIBLE
                 binding.internetNotAvailableCL.visibility = View.GONE
+                binding.pendingTest.visibility = View.VISIBLE
                 loadUserData()
                 setSearch()
                 checkForLocalDBData()
+                if (Constants.MOLBIO_INTEGRATION) {
                     checkForTokenAndUpdate()
+                }
 
                 hemoCubeViewModel.allUserData.observe(viewLifecycleOwner) { userDataList ->
                     val resultList = MolbioV2ResultRequest(mutableListOf(MolbioV2Result()))
                     userDataList.forEach { userData ->
-                        if (!userData.molbioFlag && isTokenAvailable) {
+                        if (!userData.molbioFlag && isTokenAvailable && Constants.MOLBIO_INTEGRATION) {
                             resultList.results?.add(
                                 MolbioV2Result(
                                     rawData = userData,
                                     analysisId = userData._id,
-                                    analysisDate = "2024-02-08 16:33:56",
+                                    analysisDate = "2024-02-08 16:33:56",//userData.testTime,
                                     analysisStatus = userData.classificationResult,
                                     thresholds = Constants.BUFFER_INTENSITY_THRESHOLDS[userData.deviceId].toString(),
                                     interpretation = userData.classificationResult,
@@ -160,10 +163,11 @@ class HomeFragment : Fragment() {
                                 )
                             )
                         }
-                        if (!userData.molbioFlag && isTokenAvailable) {
+                        if (!userData.molbioFlag && isTokenAvailable && Constants.MOLBIO_INTEGRATION) {
                             userData.molbioFlag = true
                             hemoCubeViewModel.uploadResult(resultList)
                         }
+
                         if (!userData.localFlag) {
                             userData.localFlag = true
                             hemoCubeViewModel.bulkAddResultTestToDb(userData)
@@ -173,9 +177,9 @@ class HomeFragment : Fragment() {
 
                 }
 
-
             } else {
                 binding.internetAvailableCL.visibility = View.GONE
+                binding.pendingTest.visibility = View.GONE
                 binding.internetNotAvailableCL.visibility = View.VISIBLE
                 setUserId()
             }
@@ -195,14 +199,13 @@ class HomeFragment : Fragment() {
             logoutUser(requireContext())
         }
 
-
         binding.uploadData.setOnClickListener {
             showUploadDialog(requireContext())
         }
         hemoCubeViewModel.allUserData.observe(viewLifecycleOwner) { userData ->
 
             val btnSaveLocalVisibility =
-                if (userData.any { it.testStatus == true }) View.VISIBLE else View.GONE
+                if (userData.any { it.testStatus == true }) View.GONE else View.GONE
 
             binding.downloadCSV.visibility = btnSaveLocalVisibility
 
@@ -269,7 +272,7 @@ class HomeFragment : Fragment() {
                     hemoCubeViewModel.downloadClientCertificate()
                 }
             }
-        }else if (deviceId.isNotEmpty()) {
+        } else if (deviceId.isNotEmpty()) {
             fetchDeviceCredentials()
             // This code will execute after credentials have been successfully fetched and stored.
             userID = sharedPreference.getString("username", "").toString()
@@ -346,8 +349,6 @@ class HomeFragment : Fragment() {
             }
         }
 
-
-
         hemoCubeViewModel.downloadcertificate.observe(viewLifecycleOwner) { response ->
             when (response) {
                 is Result.Success -> {
@@ -356,12 +357,22 @@ class HomeFragment : Fragment() {
                     val fileName = "nats_certificate.zip"
                     val downloadDirectory = "NATS"
                     val file = downloadFile(url, requireContext(), fileName, downloadDirectory)
-                    Toast.makeText(requireContext(), "NATS certificate Downloaded", Toast.LENGTH_SHORT).show()
+                    Toast.makeText(
+                        requireContext(),
+                        "NATS certificate Downloaded",
+                        Toast.LENGTH_SHORT
+                    ).show()
 
-                    val unzipDirectoryPath = requireContext().getExternalFilesDir(null)?.absolutePath + "/$downloadDirectory"
+                    val unzipDirectoryPath =
+                        requireContext().getExternalFilesDir(null)?.absolutePath + "/$downloadDirectory"
                     unzip(file.absolutePath, unzipDirectoryPath)
-                    Toast.makeText(requireContext(), "NATS certificate Extracted", Toast.LENGTH_SHORT).show()
+                    Toast.makeText(
+                        requireContext(),
+                        "NATS certificate Extracted",
+                        Toast.LENGTH_SHORT
+                    ).show()
                 }
+
                 is Result.Error -> {
                     response.exception.let { message ->
                         Toast.makeText(
@@ -459,7 +470,12 @@ class HomeFragment : Fragment() {
         )
     }
 
-    private fun downloadFile(responseBody: ResponseBody, context: Context, fileName: String, downloadDirectory: String): File {
+    private fun downloadFile(
+        responseBody: ResponseBody,
+        context: Context,
+        fileName: String,
+        downloadDirectory: String,
+    ): File {
         // Ensure the download directory exists
         val fileDir = File(context.getExternalFilesDir(null), downloadDirectory)
         if (!fileDir.exists()) {
@@ -480,8 +496,6 @@ class HomeFragment : Fragment() {
     }
 
 
-
-
     private fun unzip(zipFilePath: String, destDirectory: String) {
         val destDir = File(destDirectory)
         if (!destDir.exists()) {
@@ -538,12 +552,12 @@ class HomeFragment : Fragment() {
         }
     }
 
-
     private fun fetchDeviceCredentials() {
         try {
             val db = Firebase.firestore
             // Ensure deviceId is not null or empty
-            val deviceId = sharedPreference.getString(Constants.DEVICE_ID, "").takeIf { it!!.isNotBlank() }
+            val deviceId =
+                sharedPreference.getString(Constants.DEVICE_ID, "").takeIf { it!!.isNotBlank() }
                     ?: throw IllegalStateException("Device ID is missing or blank.")
 
             val deviceRef = db.collection("devices").whereEqualTo("deviceId", deviceId)
@@ -551,13 +565,17 @@ class HomeFragment : Fragment() {
             deviceRef.get()
                 .addOnSuccessListener { documentSnapshot ->
                     if (!documentSnapshot.isEmpty) {
-                        val deviceData = documentSnapshot.documents[0].toObject(DeviceData::class.java)
+                        val deviceData =
+                            documentSnapshot.documents[0].toObject(DeviceData::class.java)
                         deviceData?.let { data ->
                             val username = data.username
                             val password = data.password
                             val natsToken = data.natsToken
                             // Log for debugging
-                            Log.d("fetchDeviceCredentials", "Username: $username, Password: $password")
+                            Log.d(
+                                "fetchDeviceCredentials",
+                                "Username: $username, Password: $password"
+                            )
                             // Save credentials in SharedPreferences
                             with(sharedPreference.edit()) {
                                 putString("username", username)
@@ -749,7 +767,7 @@ class HomeFragment : Fragment() {
     private fun checkUnprocessedCSVData() {
         hemoCubeViewModel.allUserData.observe(viewLifecycleOwner) { userDataList ->
             val downloadDataVisibility =
-                if (userDataList.any { !it.isCSVCreated && it.testStatus == true }) View.VISIBLE else View.GONE
+                if (userDataList.any { !it.isCSVCreated && it.testStatus == true }) View.GONE else View.GONE
             binding.downloadCSV.visibility = downloadDataVisibility
         }
     }
@@ -817,7 +835,7 @@ class HomeFragment : Fragment() {
                             thresholds = Constants.BUFFER_INTENSITY_THRESHOLDS[userData.deviceId].toString(),
                             interpretation = userData.classificationResult,
                             testId = userData._id,
-                                testTime = "2024-02-08 16:33:56",//userData.testTime,
+                            testTime = userData.testTime,
                             collectionTime = "2024-02-08 16:33:56",//userData.testTime,
                             expiryTime = "2024-02-08 16:33:56",//userData.testTime,
                         )
@@ -825,11 +843,11 @@ class HomeFragment : Fragment() {
 
                 }
 
-                if(!userData.localFlag){
+                if (!userData.localFlag) {
                     userData.localFlag = true
                     hemoCubeViewModel.bulkAddResultTestToDb(userData)
                 }
-                if (!userData.molbioFlag && isTokenAvailable) {
+                if (!userData.molbioFlag && isTokenAvailable && Constants.MOLBIO_INTEGRATION) {
                     userData.molbioFlag = true
                     hemoCubeViewModel.uploadResult(resultList)
                 }
@@ -846,6 +864,37 @@ class HomeFragment : Fragment() {
             }
             dialog.dismiss()
         }
+
+        hemoCubeViewModel.allUserData.observe(viewLifecycleOwner) { userDataList ->
+            val resultList = MolbioV2ResultRequest(mutableListOf(MolbioV2Result()))
+            userDataList.forEach { userData ->
+                if (!userData.molbioFlag && isTokenAvailable) {
+                    resultList.results?.add(
+                        MolbioV2Result(
+                            rawData = userData,
+                            analysisId = userData._id,
+                            analysisDate = "2024-02-08 16:33:56",//userData.testTime,
+                            analysisStatus = userData.classificationResult,
+                            thresholds = Constants.BUFFER_INTENSITY_THRESHOLDS[userData.deviceId].toString(),
+                            interpretation = userData.classificationResult,
+                            testId = userData._id,
+                            testTime = "2024-02-08 16:33:56",//userData.testTime,
+                            collectionTime = "2024-02-08 16:33:56",//userData.testTime,
+                            expiryTime = "2024-02-08 16:33:56"//userData.testTime,
+                        )
+                    )
+                    userData.molbioFlag = true
+                    hemoCubeViewModel.uploadResult(resultList)
+                }
+
+                if (!userData.localFlag) {
+                    userData.localFlag = true
+                    hemoCubeViewModel.bulkAddResultTestToDb(userData)
+                }
+
+            }
+            dialog.dismiss()
+        }
     }
 
 //    private fun downloadLocalDBData(dialog: DialogInterface) {

app/src/main/java/com/example/hpostesting/presentation/dashboard/SlideshowFragment.kt

@@ -37,7 +37,8 @@ class SlideshowFragment : PreferenceFragmentCompat() {
         // App Version Preference
         val appVersionPreference = Preference(requireContext())
         appVersionPreference.title = "App Version"
-        appVersionPreference.summary = getAppVersion(requireContext()) + " [ " + getAppEnvironment(requireContext()) + " ]"
+        appVersionPreference.summary =
+            getAppVersion(requireContext()) + " [ " + getAppEnvironment(requireContext()) + " ]"
 
         preferenceScreen.addPreference(languagePreference)
         preferenceScreen.addPreference(appVersionPreference)

app/src/main/java/com/example/hpostesting/presentation/dashboard/ui/LoginFragment.kt

@@ -3,11 +3,11 @@ package com.example.hpostesting.presentation.dashboard.ui
 import android.content.Context
 import android.content.SharedPreferences
 import android.os.Bundle
-import androidx.fragment.app.Fragment
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import android.widget.Toast
+import androidx.fragment.app.Fragment
 import androidx.navigation.fragment.findNavController
 import com.example.hpostesting.data.constant.Constants
 import `in`.sminnovations.hpostesting.R
@@ -20,7 +20,7 @@ class LoginFragment : Fragment() {
     private lateinit var sharedPreference: SharedPreferences
     override fun onCreateView(
         inflater: LayoutInflater, container: ViewGroup?,
-        savedInstanceState: Bundle?
+        savedInstanceState: Bundle?,
     ): View {
         _binding = FragmentLoginBinding.inflate(inflater, container, false)
         sharedPreference =
@@ -33,7 +33,6 @@ class LoginFragment : Fragment() {
         init()
     }
 
-
     private fun init() {
         if (isUserLoggedIn()) {
             navigateToHomeFragment()

app/src/main/java/com/example/hpostesting/presentation/deviceinfo/DeviceActivity.kt

@@ -12,13 +12,13 @@ import android.content.SharedPreferences
 import android.hardware.usb.UsbDevice
 import android.hardware.usb.UsbDeviceConnection
 import android.hardware.usb.UsbManager
-import androidx.appcompat.app.AppCompatActivity
 import android.os.Bundle
 import android.os.IBinder
 import android.util.Log
 import android.view.Menu
 import android.widget.Toast
 import androidx.activity.viewModels
+import androidx.appcompat.app.AppCompatActivity
 import androidx.core.content.ContextCompat
 import androidx.core.view.get
 import com.example.hpostesting.data.DataHolder
@@ -172,6 +172,7 @@ class DeviceActivity : AppCompatActivity(), DeviceCommunicationHandler {
         menuInflater.inflate(R.menu.my_menu, menu)
         return true
     }
+
     override fun onDestroy() {
         super.onDestroy()
         if (deviceViewModel.isServiceConnected) {
@@ -182,6 +183,9 @@ class DeviceActivity : AppCompatActivity(), DeviceCommunicationHandler {
     }
 
     override fun sendAndListenToDevice(command: HemoCubeCommands, listener: UsbServiceListener) {
-        mService.sendAndListenToHemoCube(command = HemoCubeCommands.DEVICE_CONFIGURATION_COMMAND, listener)
+        mService.sendAndListenToHemoCube(
+            command = HemoCubeCommands.DEVICE_CONFIGURATION_COMMAND,
+            listener
+        )
     }
 }

app/src/main/java/com/example/hpostesting/presentation/deviceinfo/DeviceFragment.kt

@@ -18,8 +18,6 @@ import com.google.firebase.crashlytics.ktx.crashlytics
 import com.google.firebase.ktx.Firebase
 import `in`.sminnovations.hpostesting.databinding.FragmentDeviceBinding
 
-
-
 class DeviceFragment : Fragment() {
     private lateinit var binding: FragmentDeviceBinding
     private val deviceViewModel: HemoCubeViewModel by activityViewModels()
@@ -61,6 +59,7 @@ class DeviceFragment : Fragment() {
                         binding.tvSubtitle4.text = "Device ID: ${stringData}"
                     }
                 }
+
                 override fun onUsbError(e: Exception?) {
                     deviceViewModel.progressBar.postValue(false)
                 }
@@ -68,7 +67,6 @@ class DeviceFragment : Fragment() {
     }
 
 
-
     private fun listenToHemoCube() {
 
         val fullReadOutput = StringBuilder()

app/src/main/java/com/example/hpostesting/presentation/deviceinfo/DeviceViewModel.kt

@@ -7,6 +7,7 @@ import com.example.hpostesting.data.model.patient.DeviceData
 import com.example.hpostesting.data.repository.Repository
 import dagger.hilt.android.lifecycle.HiltViewModel
 import javax.inject.Inject
+
 @HiltViewModel
 class DeviceViewModel @Inject constructor(
     private val hemoCubeDao: HemoCubeDao,
@@ -15,12 +16,6 @@ class DeviceViewModel @Inject constructor(
     var isServiceConnected = false
     val progressBar = MutableLiveData(false)
     val messages = MutableLiveData<String>()
-//    private val _networkStatusLiveData = NetworkStatusLiveData(context)
-//    val allUserData = hemoCubeDao.getAll()
     val deviceData = MutableLiveData<DeviceData?>()
-//    val networkStatusLiveData: LiveData<Boolean>
-//        get() = _networkStatusLiveData
-val fireBaseUpload = MutableLiveData<String>()
-    val fireBaseBulkUpload = MutableLiveData<String>()
-
+    val fireBaseUpload = MutableLiveData<String>()
 }

app/src/main/java/com/example/hpostesting/presentation/deviceprovision/DeviceProvisionActivity.kt

@@ -145,7 +145,8 @@ class DeviceProvisionActivity : AppCompatActivity(), DeviceCommunicationHandler
 
     @SuppressLint("MutableImplicitPendingIntent")
     private fun requestUserPermission(manager: UsbManager, device: UsbDevice) {
-        val mPendingIntent: PendingIntent = if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.S) {
+        val mPendingIntent: PendingIntent =
+            if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.S) {
                 PendingIntent.getBroadcast(
                     this, 0, Intent(Constants.HEMOCUBE_USB_PERMISSION), PendingIntent.FLAG_MUTABLE
                 )
@@ -185,6 +186,9 @@ class DeviceProvisionActivity : AppCompatActivity(), DeviceCommunicationHandler
     }
 
     override fun sendAndListenToDevice(command: HemoCubeCommands, listener: UsbServiceListener) {
-        mService.sendAndListenToHemoCube(command = HemoCubeCommands.DEVICE_CONFIGURATION_COMMAND, listener)
+        mService.sendAndListenToHemoCube(
+            command = HemoCubeCommands.DEVICE_CONFIGURATION_COMMAND,
+            listener
+        )
     }
 }

app/src/main/java/com/example/hpostesting/presentation/deviceprovision/DeviceProvisionFragment.kt

@@ -33,31 +33,36 @@ class DeviceProvisionFragment : Fragment() {
     private var isOnline = false
     val deviceData = MutableLiveData<DeviceData?>()
     override fun onCreateView(
-        inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?
+        inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?,
     ): View {
         binding = FragmentDeviceProvisionBinding.inflate(inflater, container, false)
         sharedPreferences = requireContext().getSharedPreferences("HEMOCUBE", Context.MODE_PRIVATE)
         return binding.root
     }
+
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
         initViews()
         observeViewModel()
     }
+
     private fun initViews() {
         listenToHemoCube()
         getDeviceId()
         binding.btnSubmit.setOnClickListener {
+            if (Constants.MOLBIO_INTEGRATION) {
                 viewModel.deviceProvision(
                     DeviceProvisionRequest(
                         email = Constants.deviceProvisionEmail,
                         password = Constants.deviceProvisionPassword,
-                    serialNumber = sharedPreferences.getString(Constants.DEVICE_ID, "").toString(),
+                        serialNumber = sharedPreferences.getString(Constants.DEVICE_ID, "")
+                            .toString(),
                         uid = sharedPreferences.getString(Constants.DEVICE_ID, "").toString()
                     )
                 )
             }
         }
+    }
 
 
     private fun observeViewModel() {
@@ -83,7 +88,8 @@ class DeviceProvisionFragment : Fragment() {
                                 response.data.data?.device?.deviceUser?.natsToken
                             )
                             response.data.data?.device?.deviceUser?.natsToken?.let {
-                                Log.e("natstoken",
+                                Log.e(
+                                    "natstoken",
                                     it
                                 )
                             }
@@ -104,7 +110,8 @@ class DeviceProvisionFragment : Fragment() {
                         ).show()
                         viewModel.addDeviceProvisionDataToDb(
                             DeviceData(
-                                deviceId = sharedPreferences.getString(Constants.DEVICE_ID, "").toString(),
+                                deviceId = sharedPreferences.getString(Constants.DEVICE_ID, "")
+                                    .toString(),
                                 username = response.data.data?.credentials?.username.toString(),
                                 password = response.data.data?.credentials?.password.toString(),
                                 deviceProvisionResponse = response.data.data.toString(),
@@ -113,9 +120,9 @@ class DeviceProvisionFragment : Fragment() {
                             )
                         )
 //                        viewModel.addDeviceId(DeviceData(deviceId = sharedPreferences.getString(Constants.DEVICE_ID, "").toString()))
-                        Log.e("idpass",response.toString())
-                        Log.e("idpass",response.data.data?.credentials?.username.toString())
-                        Log.e("idpass",deviceProvisionResponse)
+                        Log.e("idpass", response.toString())
+                        Log.e("idpass", response.data.data?.credentials?.username.toString())
+                        Log.e("idpass", deviceProvisionResponse)
                     } else {
                         Toast.makeText(
                             activity,
@@ -147,7 +154,9 @@ class DeviceProvisionFragment : Fragment() {
         viewModel.fireBaseUpload.observe(viewLifecycleOwner) { result ->
             if (result == "Success") {
                 Toast.makeText(
-                    activity, "Device provision successfully uploaded to firebase", Toast.LENGTH_LONG
+                    activity,
+                    "Device provision successfully uploaded to firebase",
+                    Toast.LENGTH_LONG
                 ).show()
             }
         }

app/src/main/java/com/example/hpostesting/presentation/diagnostics/DiagnosticsActivity.kt

@@ -11,13 +11,13 @@ import android.content.ServiceConnection
 import android.hardware.usb.UsbDevice
 import android.hardware.usb.UsbDeviceConnection
 import android.hardware.usb.UsbManager
-import androidx.appcompat.app.AppCompatActivity
 import android.os.Bundle
 import android.os.IBinder
 import android.util.Log
 import android.view.Menu
 import android.widget.Toast
 import androidx.activity.viewModels
+import androidx.appcompat.app.AppCompatActivity
 import androidx.core.content.ContextCompat
 import androidx.core.view.get
 import com.example.hpostesting.data.DataHolder
@@ -63,7 +63,6 @@ class DiagnosticsActivity : AppCompatActivity() {
         }
     }
 
-
     private val connection = object : ServiceConnection {
         override fun onServiceConnected(className: ComponentName, service: IBinder) {
             val binder = service as UsbService.UsbServiceBinder
@@ -108,6 +107,7 @@ class DiagnosticsActivity : AppCompatActivity() {
             }
         }
     }
+
     open fun connectUsb(permissionGranted: Boolean) {
         Log.d(TAG, "connectUsb() called, permission variable = $permissionGranted")
         val manager = getSystemService(Context.USB_SERVICE) as UsbManager
@@ -127,17 +127,16 @@ class DiagnosticsActivity : AppCompatActivity() {
         }
     }
 
-
     fun onErrorReported(msg: String) {
         Toast.makeText(this, msg, Toast.LENGTH_SHORT).show()
         if (!isFinishing) onBackPressed()
     }
 
-
     private fun moveToNext() {
         if (supportFragmentManager.isDestroyed) return
 
-        supportFragmentManager.beginTransaction().replace(binding.fgDiagnostics.id, DiagnosticsFragment())
+        supportFragmentManager.beginTransaction()
+            .replace(binding.fgDiagnostics.id, DiagnosticsFragment())
             .commit()
     }
 
@@ -162,17 +161,16 @@ class DiagnosticsActivity : AppCompatActivity() {
         manager.requestPermission(device, mPendingIntent)
     }
 
-
     fun setupService() {
         val intent = Intent(this, UsbService::class.java)
         bindService(intent, connection, Context.BIND_AUTO_CREATE)
     }
 
-
     override fun onCreateOptionsMenu(menu: Menu?): Boolean {
         menuInflater.inflate(R.menu.my_menu, menu)
         return true
     }
+
     override fun onDestroy() {
         super.onDestroy()
         if (viewModel.isServiceConnected) {

app/src/main/java/com/example/hpostesting/presentation/diagnostics/DiagnosticsFragment.kt

@@ -1,6 +1,8 @@
 package com.example.hpostesting.presentation.diagnostics
 
 import android.content.Context
+import android.content.Intent
+import android.content.IntentFilter
 import android.content.SharedPreferences
 import android.os.Bundle
 import android.util.Log
@@ -11,8 +13,12 @@ import android.widget.Toast
 import androidx.fragment.app.Fragment
 import androidx.fragment.app.activityViewModels
 import androidx.lifecycle.MutableLiveData
+import com.example.hpostesting.data.Result
+import com.example.hpostesting.data.Result.Success
 import com.example.hpostesting.data.constant.Constants
 import com.example.hpostesting.data.constant.HemoCubeCommands
+import com.example.hpostesting.data.model.devicediagnostics.AdditionalDetails
+import com.example.hpostesting.data.model.devicediagnostics.DeviceDiagnosticsRequest
 import com.example.hpostesting.data.model.diagnostics.DiagnosticsData
 import com.example.hpostesting.data.model.patient.DeviceData
 import com.example.hpostesting.presentation.UsbServiceListener
@@ -32,7 +38,10 @@ class DiagnosticsFragment : Fragment() {
     private var resultData: String = ""
     private val messages = MutableLiveData<String>()
     private var startListening = MutableLiveData(false)
-
+    private val batteryStatus: Intent? =
+        IntentFilter(Intent.ACTION_BATTERY_CHANGED).let { ifilter ->
+            context?.registerReceiver(null, ifilter)
+        }
     override fun onCreateView(
         inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?,
     ): View {
@@ -56,7 +65,25 @@ class DiagnosticsFragment : Fragment() {
         binding.btnSubmit.setOnClickListener {
             binding.btnSubmit.visibility = View.GONE
             runDeviceDiagnostics()
+            val batteryLevel = "" //diagnosticsViewModel.getBatteryLevel().toString()
+            val batteryCapacity = "" //context?.let { diagnosticsViewModel.getBatteryCapacity(it).toString() }
+            val batteryMaxCapacity = "" //context?.let { diagnosticsViewModel.getBatteryMaxCapacity(it).toString() }
+            val batteryTemperature = "" //diagnosticsViewModel.getBatteryTemperature().toString()
+            val batteryVoltage = "" // context?.let { diagnosticsViewModel.getBatteryVoltage(it).toString() }
+
+            val additionalDetails = AdditionalDetails(
+                batteryLevel = batteryLevel,
+                batteryCapacity = batteryCapacity!!,
+                batteryMaxCapacity = batteryMaxCapacity!!,
+                batteryTemperature = batteryTemperature,
+                batteryVoltage = batteryVoltage!!
+            )
+            diagnosticsViewModel.deviceDiagnostics(
+                DeviceDiagnosticsRequest(additionalDetails = additionalDetails)
+            )
         }
+
+
     }
 
 
@@ -68,7 +95,7 @@ class DiagnosticsFragment : Fragment() {
 
         messages.observe(viewLifecycleOwner) {
             binding.tvSubtitle4.text = it
-            Log.e("diagnostics",binding.tvSubtitle4.text.toString())
+            Log.e("diagnostics", binding.tvSubtitle4.text.toString())
         }
 
         diagnosticsViewModel.fireBaseUpload.observe(viewLifecycleOwner) { result ->
@@ -81,6 +108,42 @@ class DiagnosticsFragment : Fragment() {
 
             binding.progressBar.visibility = View.GONE
         }
+
+        diagnosticsViewModel.deviceDiagnosticsResponse.observe(viewLifecycleOwner) { response ->
+            when (response) {
+                is Success -> {
+                    if (response.data.result == "Success") {
+                        Toast.makeText(
+                            activity, response.data.message ?: "Device diagnostics uploaded successfully", Toast.LENGTH_LONG
+                        ).show()
+
+                        response.data.data?.let { diagnosticsData ->
+
+                            val batteryLevel = diagnosticsData.additionalDetails?.batteryLevel
+
+                        }
+                    } else {
+                        Toast.makeText(
+                            activity,
+                            "${response.data.message}",
+                            Toast.LENGTH_LONG
+                        ).show()
+                    }
+                }
+                is Result.Error -> {
+                    // Handle the error scenario
+                    Toast.makeText(
+                        activity,
+                        "An error occurred: ${response.exception.message}",
+                        Toast.LENGTH_LONG
+                    ).show()
+                }
+                is Result.Loading -> {
+                }
+            }
+        }
+
+
     }
 
     private fun getDeviceId() {
@@ -95,6 +158,7 @@ class DiagnosticsFragment : Fragment() {
                         binding.tvSubtitle4.text = stringData
                     }
                 }
+
                 override fun onUsbError(e: Exception?) {
                     diagnosticsViewModel.progressBar.postValue(false)
                 }
@@ -107,22 +171,23 @@ class DiagnosticsFragment : Fragment() {
             HemoCubeCommands.DIAGNOSTICS_COMMAND,
             object : UsbServiceListener {
                 override fun onUsbRead(data: ByteArray?) {
-
-
                 }
+
                 override fun onUsbError(e: Exception?) {
                     diagnosticsViewModel.progressBar.postValue(false)
                 }
             })
     }
 
+
     private fun listenToHemoCube() {
 
         val fullReadOutput = StringBuilder()
         startListening.postValue(true)
 
         try {
-            (activity as DiagnosticsActivity).mService.listenToHemoCube(object : UsbServiceListener {
+            (activity as DiagnosticsActivity).mService.listenToHemoCube(object :
+                UsbServiceListener {
                 override fun onUsbRead(data: ByteArray?) {
                     data?.let {
                         val stringData = String(it)
@@ -146,16 +211,28 @@ class DiagnosticsFragment : Fragment() {
                     }
 
                     if (resultData.contains("END") || fullReadOutput.contains("END")) {
-                        diagnosticsViewModel.addDiagnosticsDataToDb(DiagnosticsData(
-                            deviceId = sharedPreferences.getString(Constants.DEVICE_ID, "").toString(),
-                            devicePassword = sharedPreferences.getString(Constants.DEVICE_PASSWORD_API, "").toString(),
-                            deviceNatsToken = sharedPreferences.getString(Constants.NATS_TOKEN, "").toString(),
-                            accessToken = sharedPreferences.getString(Constants.ACCESS_TOKEN, "").toString(),
+                        diagnosticsViewModel.addDiagnosticsDataToDb(
+                            DiagnosticsData(
+                                deviceId = sharedPreferences.getString(Constants.DEVICE_ID, "")
+                                    .toString(),
+                                devicePassword = sharedPreferences.getString(
+                                    Constants.DEVICE_PASSWORD_API,
+                                    ""
+                                ).toString(),
+                                deviceNatsToken = sharedPreferences.getString(
+                                    Constants.NATS_TOKEN,
+                                    ""
+                                ).toString(),
+                                accessToken = sharedPreferences.getString(
+                                    Constants.ACCESS_TOKEN,
+                                    ""
+                                ).toString(),
                                 deviceData = resultData,
                                 runTime = SimpleDateFormat(
                                     "yyyy-MM-dd HH:mm:ss", Locale.getDefault()
                                 ).format(Calendar.getInstance().time)
-                        ))
+                            )
+                        )
                     }
 //                    val inputData = mutableListOf<String>()
 //                    while (true) {
@@ -178,7 +255,6 @@ class DiagnosticsFragment : Fragment() {
         }
     }
 
-
     fun parseData(inputData: List<String>): List<Pair<String, String>> {
         val pattern = Regex("([A-Z]+)\\s(\\d+)")
         val parsedData = mutableListOf<Pair<String, String>>()

app/src/main/java/com/example/hpostesting/presentation/diagnostics/DiagnosticsViewModel.kt

@@ -3,16 +3,21 @@ package com.example.hpostesting.presentation.diagnostics
 import androidx.lifecycle.MutableLiveData
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
+import com.example.hpostesting.data.Result
 import com.example.hpostesting.data.model.Response
+import com.example.hpostesting.data.model.devicediagnostics.DeviceDiagnosticsRequest
+import com.example.hpostesting.data.model.devicediagnostics.DeviceDiagnosticsResponse
 import com.example.hpostesting.data.model.diagnostics.DiagnosticsData
 import com.example.hpostesting.data.model.patient.DeviceData
 import com.example.hpostesting.data.repository.Repository
 import dagger.hilt.android.lifecycle.HiltViewModel
 import kotlinx.coroutines.launch
 import javax.inject.Inject
+
 @HiltViewModel
 class DiagnosticsViewModel @Inject constructor(
-    private val repository: Repository
+    private val repository: Repository,
+//    context: Context,
 ) : ViewModel() {
     var isServiceConnected = false
     val progressBar = MutableLiveData(false)
@@ -20,7 +25,11 @@ class DiagnosticsViewModel @Inject constructor(
 
     val deviceData = MutableLiveData<DeviceData?>()
     val fireBaseUpload = MutableLiveData<String>()
-
+    val deviceDiagnosticsResponse = MutableLiveData<com.example.hpostesting.data.Result<DeviceDiagnosticsResponse>>()
+//    private val batteryStatus: Intent? =
+//        IntentFilter(Intent.ACTION_BATTERY_CHANGED).let { ifilter ->
+//            context.registerReceiver(null, ifilter)
+//        }
     fun addDiagnosticsDataToDb(data: DiagnosticsData) {
         viewModelScope.launch {
             try {
@@ -43,4 +52,81 @@ class DiagnosticsViewModel @Inject constructor(
             }
         }
     }
+
+
+    fun deviceDiagnostics(deviceDiagnosticsRequest: DeviceDiagnosticsRequest) = viewModelScope.launch {
+        deviceDiagnosticsResponse.postValue(Result.Loading())
+        repository.deviceDiagnostics(deviceDiagnosticsRequest).let {
+            deviceDiagnosticsResponse.postValue(it)
+        }
+    }
+
+
+//    fun getBatteryLevel(): Float? {
+//        val batteryPct: Float? = batteryStatus?.let { intent ->
+//            val level: Int =
+//                intent.getIntExtra(
+//                    BatteryManager.EXTRA_LEVEL,
+//                    -1
+//                )
+//            val scale: Int =
+//                intent.getIntExtra(
+//                    BatteryManager.EXTRA_SCALE,
+//                    -1
+//                )
+//            level * 100 / scale.toFloat()
+//        }
+//
+//        return batteryPct
+//    }
+//
+//    fun getBatteryTemperature(): Float? {
+//        val batteryTemp: Float? = batteryStatus?.let { intent ->
+//            val temperature = intent.getIntExtra(
+//                BatteryManager.EXTRA_TEMPERATURE,
+//                0
+//            )
+//            temperature.toFloat() / 10
+//        }
+//
+//        return batteryTemp
+//    }
+//
+//    fun getBatteryVoltage(context: Context): Float {
+//        val batteryIntent =
+//            context.registerReceiver(
+//                null,
+//                IntentFilter(Intent.ACTION_BATTERY_CHANGED)
+//            )
+//        val voltage = batteryIntent?.getIntExtra(
+//            BatteryManager.EXTRA_VOLTAGE,
+//            0
+//        ) ?: 0
+//
+//        // milli-volts to volts
+//        return voltage.toFloat() / 1000
+//    }
+//
+//
+//    fun getBatteryCapacity(context: Context): Int {
+//        val batteryManager =
+//            context.getSystemService(Context.BATTERY_SERVICE) as BatteryManager
+//        val currentCapacity =
+//            batteryManager.getIntProperty(BatteryManager.BATTERY_PROPERTY_CHARGE_COUNTER)
+//
+//        return currentCapacity
+//    }
+//
+//    fun getBatteryMaxCapacity(context: Context): Float {
+//        val batteryManager = context.getSystemService(Context.BATTERY_SERVICE) as BatteryManager
+//        val designCapacity =
+//            batteryManager.getIntProperty(BatteryManager.BATTERY_PROPERTY_CAPACITY)
+//        val currentCapacity =
+//            batteryManager.getIntProperty(BatteryManager.BATTERY_PROPERTY_CHARGE_COUNTER)
+//
+//        // Calculate the estimated maximum battery capacity in mAh
+//        val maxCapacity = currentCapacity.toFloat() / designCapacity.toFloat() * 100
+//
+//        return maxCapacity
+//    }
 }

app/src/main/java/com/example/hpostesting/presentation/hemocube/DigitalCardActivity.kt

@@ -1,25 +1,10 @@
 package com.example.hpostesting.presentation.hemocube
 
-import android.content.BroadcastReceiver
-import android.content.ComponentName
 import android.content.Context
-import android.content.Intent
-import android.content.ServiceConnection
-import android.hardware.usb.UsbDevice
-import android.hardware.usb.UsbDeviceConnection
-import android.hardware.usb.UsbManager
-import androidx.appcompat.app.AppCompatActivity
 import android.os.Bundle
-import android.os.IBinder
-import android.view.Menu
-import androidx.activity.viewModels
-import com.example.hpostesting.data.DataHolder
+import androidx.appcompat.app.AppCompatActivity
 import com.example.hpostesting.data.constant.LanguageManager
-import com.example.hpostesting.presentation.testRight.UsbService
-import com.hoho.android.usbserial.driver.UsbSerialDriver
-import `in`.sminnovations.hpostesting.R
 import `in`.sminnovations.hpostesting.databinding.ActivityDigitalCardBinding
-import `in`.sminnovations.hpostesting.databinding.ActivityHemocubeBinding
 
 class DigitalCardActivity : AppCompatActivity() {
 
@@ -38,10 +23,10 @@ class DigitalCardActivity : AppCompatActivity() {
         moveToNext()
     }
 
-
     private fun moveToNext() {
         if (supportFragmentManager.isDestroyed) return
-        supportFragmentManager.beginTransaction().replace(binding.fghemocube.id, DigitalCardFragment())
+        supportFragmentManager.beginTransaction()
+            .replace(binding.fghemocube.id, DigitalCardFragment())
             .commit()
     }
 }

app/src/main/java/com/example/hpostesting/presentation/hemocube/DigitalCardFragment.kt

@@ -5,16 +5,14 @@ import android.content.Context
 import android.content.SharedPreferences
 import android.os.Bundle
 import android.util.Log
-import androidx.fragment.app.Fragment
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
+import androidx.fragment.app.Fragment
 import androidx.fragment.app.activityViewModels
 import com.example.hpostesting.data.DataHolder
 import com.example.hpostesting.data.model.patient.toHemoCubeTestData
-import `in`.sminnovations.hpostesting.R
 import `in`.sminnovations.hpostesting.databinding.FragmentDigitalCardBinding
-import `in`.sminnovations.hpostesting.databinding.FragmentHemoCubeReferenceBinding
 import java.text.SimpleDateFormat
 import java.util.Calendar
 import java.util.Date
@@ -61,14 +59,16 @@ class DigitalCardFragment : Fragment() {
             binding.State.text = "State: ${testDetails?.state}"
             binding.abhaid.text = "ABHA ID: ${testDetails?.abhaId}"
             binding.blood.text = "Blood Group: ${testDetails?.bloodGroup}"
-            binding.sicklecell.text = "Sickle-Cell: ${DataHolder.hemoCubeTestData?.prdClassification.toString()}"
-
+            binding.sicklecell.text =
+                "Sickle-Cell: ${DataHolder.hemoCubeTestData?.prdClassification.toString()}"
         }
         // Update the UI with the fetched details
         val originalDateFormat = SimpleDateFormat("yyyy-MM-dd HH:mm:ss", Locale.getDefault())
-        val originalDate: Date? = originalDateFormat.parse(SimpleDateFormat(
+        val originalDate: Date? = originalDateFormat.parse(
+            SimpleDateFormat(
                 "yyyy-MM-dd HH:mm:ss", Locale.getDefault()
-        ).format(Calendar.getInstance().time))
+            ).format(Calendar.getInstance().time)
+        )
 
 // Format the parsed date to "mm date, year"
         val desiredDateFormat = SimpleDateFormat("MMM dd, yyyy", Locale.getDefault())

app/src/main/java/com/example/hpostesting/presentation/hemocube/HemoCubeFragment.kt

@@ -134,7 +134,6 @@ class HemoCubeFragment : Fragment() {
                 checkAndStartProcess()
                 it.visibility = View.GONE
             }
-
         }
 
         if (sharedPreferences.getString(Constants.USER_ID, "").toString() == "ADMIN") {
@@ -149,24 +148,28 @@ class HemoCubeFragment : Fragment() {
             if (result == "Success") {
                 uploadedToCloud = true
                 showToast(R.string.test_upload)
+                if (Constants.MOLBIO_INTEGRATION) {
                     hemoCubeViewModel.resultUpload.observe(viewLifecycleOwner) {
                         when (it) {
                             is Result.Success -> {
                                 uploadedToMolbio = true
-                            if (Constants.MOLBIO_INTEGRATION) {
                                 it.data.data?.get(0)?.rawData?.let { it1 ->
                                     hemoCubeViewModel.updateMolbioFlag(
                                         it1._id
                                     )
                                 }
-                            }
                                 handleReadingFinish()
                             }
+
                             is Result.Error -> {
                                 binding.btnSubmit.visibility = View.VISIBLE
                                 //Remove this line of code while deploying to IOCL
                                 it.exception.let { message ->
-                                Toast.makeText(activity, "An error occurred: $message", Toast.LENGTH_LONG)
+                                    Toast.makeText(
+                                        activity,
+                                        "An error occurred: $message",
+                                        Toast.LENGTH_LONG
+                                    )
                                         .show()
                                 }
                                 handleReadingFinish()
@@ -175,6 +178,9 @@ class HemoCubeFragment : Fragment() {
                             else -> {}
                         }
                     }
+                } else {
+                    handleReadingFinish()
+                }
             }
             if (result == "Local") {
                 showToast(R.string.internt_not_local)
@@ -356,6 +362,20 @@ class HemoCubeFragment : Fragment() {
             })
     }
 
+    private fun loadDACValues() {
+        hemoCubeViewModel.progressBar.postValue(true)
+        (activity as HemocubeActivity).mService.sendAndListenToHemoCube(
+            HemoCubeCommands.LOAD_DAC_VALUES,
+            object : UsbServiceListener {
+                override fun onUsbRead(data: ByteArray?) {
+                }
+
+                override fun onUsbError(e: Exception?) {
+                    hemoCubeViewModel.progressBar.postValue(false)
+                }
+            })
+    }
+
     fun handleUsbData(stringData: String) {
         if (stringData.contains("#")) {
             isTestOngoing = true
@@ -368,6 +388,7 @@ class HemoCubeFragment : Fragment() {
         when {
             resultData.contains("SNE") && this.testStatusCode < TestStatus.CONFIG_COMPLETED.code -> {
                 processV2HardwareId(resultData)
+                loadDACValues()
             }
 
             (resultData.contains("SN") && !resultData.contains("SNS") && !resultData.contains("SNE") && resultData.length >= 15) && this.testStatusCode < TestStatus.CONFIG_COMPLETED.code -> {
@@ -387,6 +408,12 @@ class HemoCubeFragment : Fragment() {
                 fetchResult()
             }
 
+            (resultData.contains("#RC") && this.testStatusCode < TestStatus.EPROM_ADC_RETRIEVAL_COMPLETED.code) -> {
+                this.testStatusCode = TestStatus.EPROM_ADC_RETRIEVAL_COMPLETED.code
+                hemoCubeViewModel.messages.postValue("EPROM ADC Loaded")
+                showStartBufferButton()
+            }
+
             resultData.contains("#BS") && this.testStatusCode < TestStatus.BUFFER_STARTED.code -> {
                 hemoCubeViewModel.messages.postValue(getString(R.string.buffer_started))
                 this.testStatusCode = TestStatus.BUFFER_STARTED.code
@@ -411,7 +438,8 @@ class HemoCubeFragment : Fragment() {
             (resultData.contains("#SC") || resultData.contains("#SC1")) && this.testStatusCode < TestStatus.SAMPLE_COMPLETED.code -> {
                 this.testStatusCode = TestStatus.SAMPLE_COMPLETED.code
                 hemoCubeViewModel.messages.postValue(
-                    getString(R.string.sample_completed) + "\n" + getString(R.string.gathering_data))
+                    getString(R.string.sample_completed) + "\n" + getString(R.string.gathering_data)
+                )
                 fetchResult()
                 currentResultData = ""
             }
@@ -519,7 +547,8 @@ class HemoCubeFragment : Fragment() {
                     led1Gain1 = resultLines[5].split(' ')[1].trim().toDoubleOrNull()!!
                     led2Gain1 = resultLines[6].split(' ')[1].trim().toDoubleOrNull()!!
                     led3Gain1 = resultLines[7].split(' ')[1].trim().toDoubleOrNull()!!
-                    led4Gain1 = resultLines[8].split(' ')[1].split('\r')[0].trim().toDoubleOrNull()!!
+                    led4Gain1 =
+                        resultLines[8].split(' ')[1].split('\r')[0].trim().toDoubleOrNull()!!
                 }
 
                 sendSecondGainCommand()
@@ -537,7 +566,8 @@ class HemoCubeFragment : Fragment() {
                     led1Gain2 = resultLines[5].split(' ')[1].trim().toDoubleOrNull()!!
                     led2Gain2 = resultLines[6].split(' ')[1].trim().toDoubleOrNull()!!
                     led3Gain2 = resultLines[7].split(' ')[1].trim().toDoubleOrNull()!!
-                    led4Gain2 = resultLines[8].split(' ')[1].split('\r')[0].trim().toDoubleOrNull()!!
+                    led4Gain2 =
+                        resultLines[8].split(' ')[1].split('\r')[0].trim().toDoubleOrNull()!!
                 }
 
                 sendForthGainCommand()
@@ -555,7 +585,8 @@ class HemoCubeFragment : Fragment() {
                     led1Gain4 = resultLines[5].split(' ')[1].trim().toDoubleOrNull()!!
                     led2Gain4 = resultLines[6].split(' ')[1].trim().toDoubleOrNull()!!
                     led3Gain4 = resultLines[7].split(' ')[1].trim().toDoubleOrNull()!!
-                    led4Gain4 = resultLines[8].split(' ')[1].split('\r')[0].trim().toDoubleOrNull()!!
+                    led4Gain4 =
+                        resultLines[8].split(' ')[1].split('\r')[0].trim().toDoubleOrNull()!!
                 }
 
                 finishReading()
@@ -565,6 +596,7 @@ class HemoCubeFragment : Fragment() {
 
     fun finishReading() {
         repeatReadingCount += 1
+        isTestOngoing = false
 
         if (readingsPerSample == 1) {
             activity?.runOnUiThread {
@@ -633,10 +665,6 @@ class HemoCubeFragment : Fragment() {
 
         if (!hardwareId.isNullOrBlank()) {
             updateDeviceId(hardwareId)
-            activity?.runOnUiThread {
-                binding.btnPlacebuffer.visibility = View.VISIBLE
-            }
-            hemoCubeViewModel.messages.postValue(getString(R.string.start))
         } else {
             hemoCubeViewModel.messages.postValue("Config error")
         }
@@ -650,6 +678,13 @@ class HemoCubeFragment : Fragment() {
         }
     }
 
+    fun showStartBufferButton() {
+        activity?.runOnUiThread {
+            binding.btnPlacebuffer.visibility = View.VISIBLE
+        }
+        hemoCubeViewModel.messages.postValue(getString(R.string.start))
+    }
+
     fun extractV1HardwareId(input: String): String? {
         val regex = Regex("SN (\\S+)")
         val matchResult = regex.find(input)
@@ -662,10 +697,10 @@ class HemoCubeFragment : Fragment() {
 
         if (!hardwareId.isNullOrBlank()) {
             updateDeviceId(hardwareId)
-            activity?.runOnUiThread {
-                binding.btnPlacebuffer.visibility = View.VISIBLE
-            }
-            hemoCubeViewModel.messages.postValue(getString(R.string.start))
+//            activity?.runOnUiThread {
+//                binding.btnPlacebuffer.visibility = View.VISIBLE
+//            }
+//            hemoCubeViewModel.messages.postValue(getString(R.string.start))
         } else {
             hemoCubeViewModel.messages.postValue("Config error")
         }
@@ -682,10 +717,10 @@ class HemoCubeFragment : Fragment() {
     fun assignDefaultDevice(configData: String) {
         deviceHardwareId = "HCV-000-3001"
         testStatusCode = TestStatus.CONFIG_COMPLETED.code
-        activity?.runOnUiThread {
-            binding.btnPlacebuffer.visibility = View.VISIBLE
-        }
-        hemoCubeViewModel.messages.postValue(getString(R.string.start))
+//        activity?.runOnUiThread {
+//            binding.btnPlacebuffer.visibility = View.VISIBLE
+//        }
+//        hemoCubeViewModel.messages.postValue(getString(R.string.start))
     }
 
     fun extractV2HardwareId(input: String): String? {
@@ -805,7 +840,7 @@ class HemoCubeFragment : Fragment() {
 
             calculatedPredictedDenovixRatio = fittedAbs3.div(fittedAbs1)
 
-            val slope = (led4Average - led1Average) / (431-411)
+            val slope = (led4Average - led1Average) / (431 - 411)
             val calculatedSlopeRatio = abs(led2Average / slope)
             val slopeClass = slopeRatioClassification(calculatedSlopeRatio)
 
@@ -875,7 +910,13 @@ class HemoCubeFragment : Fragment() {
                 this.deviceRatioClass = deviceRatioClassification(deviceRatio)
                 this.slopeRatioClass = slopeClass
                 this.classificationResult = deviceRatioClass
-                hemoCubeViewModel.messages.postValue("${this.classificationResult} \n Device Ratio: ${"%.3f".format(this.deviceRatio)}")
+                hemoCubeViewModel.messages.postValue(
+                    "${this.classificationResult} \n Device Ratio: ${
+                        "%.3f".format(
+                            this.deviceRatio
+                        )
+                    }"
+                )
                 if (DataHolder.hemoCubeTestData?.testType == "HB")
                     hemoCubeViewModel.messages.postValue("Hb: $calculatedHb4")
                 this.errorMessages = testState.allErrorMessages
@@ -909,7 +950,11 @@ class HemoCubeFragment : Fragment() {
         }
     }
 
-    fun findResultWithAdditionalMethods(deviceRatio: Double?, deviceRatioClass: String?, slopeRatio: Double?): String {
+    fun findResultWithAdditionalMethods(
+        deviceRatio: Double?,
+        deviceRatioClass: String?,
+        slopeRatio: Double?,
+    ): String {
         try {
 //            hemoCubeViewModel.messages.postValue("post classification checks")
             if (deviceRatio != null) {

app/src/main/java/com/example/hpostesting/presentation/hemocube/HemoCubeViewModel.kt

@@ -319,6 +319,7 @@ class HemoCubeViewModel @Inject constructor(
                         Log.i("Testdb", "Data uploaded to Firestore successfully")
                         fireBaseUpload.postValue("Success")
                         testDetails.localFlag = true
+                        if (Constants.MOLBIO_INTEGRATION) {
                             uploadResult(
                                 MolbioV2ResultRequest(
                                     mutableListOf(
@@ -337,6 +338,7 @@ class HemoCubeViewModel @Inject constructor(
                                     )
                                 )
                             )
+                        }
                         hemoCubeDao.insertAll(testDetails)
                     }
 

app/src/main/java/com/example/hpostesting/presentation/hemocube/HemocubeActivity.kt

@@ -61,6 +61,7 @@ open class HemocubeActivity : AppCompatActivity() {
 
         }
     }
+
     private val connection = object : ServiceConnection {
         override fun onServiceConnected(className: ComponentName, service: IBinder) {
             val binder = service as UsbService.UsbServiceBinder
@@ -74,13 +75,13 @@ open class HemocubeActivity : AppCompatActivity() {
             viewModel.isServiceConnected = false
         }
     }
+
     override fun attachBaseContext(newBase: Context?) {
         val languageCode = LanguageManager.getSavedLanguage(newBase!!)
         LanguageManager.setLocale(newBase, languageCode)
         super.attachBaseContext(newBase)
     }
 
-
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         binding = ActivityHemocubeBinding.inflate(layoutInflater)
@@ -124,7 +125,6 @@ open class HemocubeActivity : AppCompatActivity() {
         }
     }
 
-
     @SuppressLint("MutableImplicitPendingIntent")
     private fun requestUserPermission(manager: UsbManager, device: UsbDevice) {
         val mPendingIntent: PendingIntent
@@ -175,7 +175,6 @@ open class HemocubeActivity : AppCompatActivity() {
         }
     }
 
-
     fun onErrorReported(msg: String) {
         Toast.makeText(this, msg, Toast.LENGTH_SHORT).show()
         if (!isFinishing) onBackPressed()

app/src/main/java/com/example/hpostesting/presentation/jig/JigActivity.kt

@@ -32,7 +32,7 @@ import `in`.sminnovations.hpostesting.R
 import `in`.sminnovations.hpostesting.databinding.ActivityJigBinding
 
 @AndroidEntryPoint
-class JigActivity: AppCompatActivity(){
+class JigActivity : AppCompatActivity() {
     private lateinit var binding: ActivityJigBinding
     val viewModel: JigViewModel by viewModels()
     private var myMenu: Menu? = null

app/src/main/java/com/example/hpostesting/presentation/jig/JigFragment.kt

@@ -57,17 +57,11 @@ class JigFragment : Fragment(), IDcsSdkApiDelegate {
     }
 
     private fun initScanner() {
-        //Setting up the SDK handler
         sdkHandler = SDKHandler(requireContext())
-        //Registers a particular object which conforms to IDcsSdkApiDelegate interface as a receiver of SDK notifications.
         sdkHandler!!.dcssdkSetDelegate(this)
-        //this command is telling the sdk that we're going to be connecting to the scanner via USB
         sdkHandler!!.dcssdkSetOperationalMode(DCSSDKDefs.DCSSDK_MODE.DCSSDK_OPMODE_SNAPI)
 
-        //deciding what kind of notifications we want to receive. Explained more in the function
-        //first we use bitmapping to set these values into the notifications_mask.
         var notifications_mask = 0
-        // We would like to subscribe to all barcode events
         notifications_mask =
             notifications_mask or DCSSDKDefs.DCSSDK_EVENT.DCSSDK_EVENT_BARCODE.value
         sdkHandler!!.dcssdkSubsribeForEvents(notifications_mask)
@@ -165,9 +159,7 @@ class JigFragment : Fragment(), IDcsSdkApiDelegate {
     }
 
     private fun pullTrigger() {
-        // Check if the list is not empty before accessing its elements
         if (mScannerInfoList.isNotEmpty()) {
-            // Only proceed if the scanner is not active
             if (!mScannerInfoList[0].isActive) {
                 sdkHandler?.dcssdkEstablishCommunicationSession(mScannerInfoList[0].scannerID)
             }
@@ -221,7 +213,6 @@ class JigFragment : Fragment(), IDcsSdkApiDelegate {
 //        TODO("Not yet implemented")
 //    }
 
-
     override fun dcssdkEventImage(bytes: ByteArray?, i: Int) {}
 
     override fun dcssdkEventVideo(bytes: ByteArray?, i: Int) {}

app/src/main/java/com/example/hpostesting/presentation/jig/JigViewModel.kt

@@ -18,7 +18,7 @@ import javax.inject.Inject
 class JigViewModel @Inject constructor(
     private val hemoCubeDao: HemoCubeDao,
     private val repository: Repository,
-    context: Context
+    context: Context,
 ) : ViewModel() {
     var isServiceConnected = false
     val progressBar = MutableLiveData(false)

app/src/main/java/com/example/hpostesting/presentation/testRight/UsbService.kt

@@ -14,6 +14,7 @@ import com.hoho.android.usbserial.driver.UsbSerialDriver
 import com.hoho.android.usbserial.driver.UsbSerialPort
 import com.hoho.android.usbserial.util.SerialInputOutputManager
 import java.io.IOException
+
 class UsbService : Service() {
     private val binder = UsbServiceBinder()
     private lateinit var mPort: UsbSerialPort
@@ -39,10 +40,11 @@ class UsbService : Service() {
         Log.d(TAG, "My Usb Connected ${mPort.driver}")
 
         val usbIoManager = SerialInputOutputManager(mPort,
-            object : SerialInputOutputManager.Listener{
+            object : SerialInputOutputManager.Listener {
                 override fun onNewData(data: ByteArray?) {
                     listener?.onUsbRead(data)
                 }
+
                 override fun onRunError(e: Exception?) {
                     Log.e(TAG, "onRunError() called inside eventDrivenWrite()")
                     listener?.onUsbError(e)
@@ -51,13 +53,15 @@ class UsbService : Service() {
             })
         usbIoManager.start();
     }
+
     fun disconnect() {
-        if(isUsbConnected){
+        if (isUsbConnected) {
             mPort.close()
             isUsbConnected = false;
             Log.d(TAG, "My Usb disconnected:: ${mPort.driver}")
         }
     }
+
     fun eventDrivenWrite(command: TestRightCommands, listener: UsbServiceListener) {
         this.listener = listener
         try {

app/src/main/java/com/example/hpostesting/presentation/trueheme/TrueHemeActivity.kt

@@ -76,6 +76,7 @@ class TrueHemeActivity : AppCompatActivity() {
             viewModel.isServiceConnected = false
         }
     }
+
     override fun attachBaseContext(newBase: Context?) {
         val languageCode = LanguageManager.getSavedLanguage(newBase!!)
         LanguageManager.setLocale(newBase, languageCode)

app/src/main/java/com/example/hpostesting/presentation/trueheme/TrueHemeFragment.kt

@@ -165,11 +165,16 @@ class TrueHemeFragment : Fragment() {
                             }
                             handleReadingFinish()
                         }
+
                         is Result.Error -> {
                             binding.btnSubmit.visibility = View.VISIBLE
                             //Remove this line of code while deploying to IOCL
                             it.exception.let { message ->
-                                Toast.makeText(activity, "An error occurred: $message", Toast.LENGTH_LONG)
+                                Toast.makeText(
+                                    activity,
+                                    "An error occurred: $message",
+                                    Toast.LENGTH_LONG
+                                )
                                     .show()
                             }
                             handleReadingFinish()
@@ -410,7 +415,8 @@ class TrueHemeFragment : Fragment() {
             (resultData.contains("#SC") || resultData.contains("#SC1")) && this.testStatusCode < TestStatus.SAMPLE_COMPLETED.code -> {
                 this.testStatusCode = TestStatus.SAMPLE_COMPLETED.code
                 hemoCubeViewModel.messages.postValue(
-                    getString(R.string.sample_completed) + "\n" + getString(R.string.gathering_data))
+                    getString(R.string.sample_completed) + "\n" + getString(R.string.gathering_data)
+                )
                 fetchResult()
                 currentResultData = ""
             }
@@ -518,7 +524,8 @@ class TrueHemeFragment : Fragment() {
                     led1Gain1 = resultLines[5].split(' ')[1].trim().toDoubleOrNull()!!
                     led2Gain1 = resultLines[6].split(' ')[1].trim().toDoubleOrNull()!!
                     led3Gain1 = resultLines[7].split(' ')[1].trim().toDoubleOrNull()!!
-                    led4Gain1 = resultLines[8].split(' ')[1].split('\r')[0].trim().toDoubleOrNull()!!
+                    led4Gain1 =
+                        resultLines[8].split(' ')[1].split('\r')[0].trim().toDoubleOrNull()!!
                 }
 
                 sendSecondGainCommand()
@@ -536,7 +543,8 @@ class TrueHemeFragment : Fragment() {
                     led1Gain2 = resultLines[5].split(' ')[1].trim().toDoubleOrNull()!!
                     led2Gain2 = resultLines[6].split(' ')[1].trim().toDoubleOrNull()!!
                     led3Gain2 = resultLines[7].split(' ')[1].trim().toDoubleOrNull()!!
-                    led4Gain2 = resultLines[8].split(' ')[1].split('\r')[0].trim().toDoubleOrNull()!!
+                    led4Gain2 =
+                        resultLines[8].split(' ')[1].split('\r')[0].trim().toDoubleOrNull()!!
                 }
 
                 sendForthGainCommand()
@@ -554,7 +562,8 @@ class TrueHemeFragment : Fragment() {
                     led1Gain4 = resultLines[5].split(' ')[1].trim().toDoubleOrNull()!!
                     led2Gain4 = resultLines[6].split(' ')[1].trim().toDoubleOrNull()!!
                     led3Gain4 = resultLines[7].split(' ')[1].trim().toDoubleOrNull()!!
-                    led4Gain4 = resultLines[8].split(' ')[1].split('\r')[0].trim().toDoubleOrNull()!!
+                    led4Gain4 =
+                        resultLines[8].split(' ')[1].split('\r')[0].trim().toDoubleOrNull()!!
                 }
 
                 finishReading()
@@ -828,7 +837,8 @@ class TrueHemeFragment : Fragment() {
             if ((led1Average < 0.7 || led2Average < 0.7 || led3Average < 0.7 || led4Average < 0.7) && calculatedSlopeRatio > 35.0) {
                 validationError = true
                 activity?.runOnUiThread {
-                    binding.errorMessage.text = "Severely Low Hb. Repeat test with 12 ul in 2 ml Buffer"
+                    binding.errorMessage.text =
+                        "Severely Low Hb. Repeat test with 12 ul in 2 ml Buffer"
                     binding.errorMessage.visibility = View.VISIBLE
                 }
             }

app/src/main/java/com/example/hpostesting/presentation/trueheme/TrueHemeViewModel.kt

@@ -82,7 +82,6 @@ class TrueHemeViewModel @Inject constructor(
 
     val uploadLogs = MutableLiveData<Result<UploadLogsResponse>?>()
 
-
     // Get the device ID of the device you want to retrieve data for (e.g., the first device in the list)
 
     private val _networkStatusLiveData = NetworkStatusLiveData(context)
@@ -90,7 +89,6 @@ class TrueHemeViewModel @Inject constructor(
     val allKitTestData = hemoCubeBufferDao.getAll()
     val deviceData = MutableLiveData<DeviceData?>()
 
-
     val networkStatusLiveData: LiveData<Boolean>
         get() = _networkStatusLiveData
     val deviceMessages = MutableLiveData<String?>()
@@ -381,7 +379,6 @@ class TrueHemeViewModel @Inject constructor(
         hemoCubeDao.deleteById(id = userId)
     }
 
-
     private fun addResultTestToDbforbuffercheck(bufferCheckData: BufferCheckData) {
         viewModelScope.launch {
             try {

app/src/main/java/com/example/hpostesting/util/PropertyProviderImpl.kt

@@ -5,7 +5,7 @@ import com.example.hpostesting.data.api.PropertyProvider
 import java.io.InputStream
 import java.util.Properties
 
-class PropertyProviderImpl (private val assetManager: AssetManager) : PropertyProvider {
+class PropertyProviderImpl(private val assetManager: AssetManager) : PropertyProvider {
     override fun getProperty(key: String): String {
         val inputStream: InputStream = assetManager.open("app.properties")
         val properties = Properties()

app/src/main/res/layout/activity_blank.xml

@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<layout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools">
+
+
+    <androidx.constraintlayout.widget.ConstraintLayout
+        android:id="@+id/cl_parent"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent">
+
+        <!--        <androidx.appcompat.widget.Toolbar-->
+        <!--            android:id="@+id/my_toolbar"-->
+        <!--            android:layout_width="match_parent"-->
+        <!--            android:layout_height="?attr/actionBarSize"-->
+        <!--            android:background="?attr/colorPrimary"-->
+        <!--            app:titleTextColor="#FFFFFF"-->
+        <!--            android:elevation="4dp"-->
+        <!--            app:menu="@menu/my_menu"-->
+        <!--            android:theme="@style/ToolbarTheme"-->
+        <!--            app:popupTheme="@style/ThemeOverlay.AppCompat.Light"-->
+        <!--            app:layout_constraintStart_toStartOf="parent"-->
+        <!--            app:layout_constraintTop_toTopOf="parent"/>-->
+
+        <FrameLayout
+            android:id="@+id/fg_auto_dac"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintBottom_toBottomOf="parent"
+            tools:context=".presentation.autodac.AutoDacActivity">
+
+        </FrameLayout>
+
+
+
+    </androidx.constraintlayout.widget.ConstraintLayout>
+</layout>

app/src/main/res/layout/fragment_auto_dac.xml

@@ -52,7 +52,7 @@
         android:gravity="center"
         android:text="Start"
         android:textColor="@color/black"
-        android:textSize="22sp"
+        android:textSize="11sp"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@id/tv_subtitle3" />
@@ -66,12 +66,26 @@
         android:layout_marginTop="24dp"
         android:clickable="false"
         android:gravity="center"
-        android:text="Start"
+        android:text="Start Auto DAC"
         android:textColor="@color/white"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@id/tv_subtitle4" />
 
+    <Button
+        android:id="@+id/btn_read_dac"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginHorizontal="16dp"
+        android:layout_marginTop="24dp"
+        android:clickable="false"
+        android:gravity="center"
+        android:text="Read Current DAC Values"
+        android:textColor="@color/white"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@id/btn_submit" />
+
     <!--        <Button-->
     <!--            android:id="@+id/btn_read"-->
     <!--            android:layout_width="wrap_content"-->

app/src/main/res/layout/fragment_blank.xml

@@ -0,0 +1,128 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    tools:context="com.example.hpostesting.presentation.autodac.AutoDacFragment">
+
+
+    <!--        <TextView-->
+    <!--            android:id="@+id/tv_title"-->
+    <!--            style="@style/title1"-->
+    <!--            android:layout_width="wrap_content"-->
+    <!--            android:layout_height="wrap_content"-->
+    <!--            android:layout_marginHorizontal="24dp"-->
+    <!--            android:text="@string/diagnostics"-->
+    <!--            android:layout_marginTop="16dp"-->
+    <!--            app:layout_constraintStart_toStartOf="parent"-->
+    <!--            app:layout_constraintTop_toTopOf="parent" />-->
+
+    <TextView
+        android:id="@+id/tv_subtitle2"
+        style="@style/title2"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_marginHorizontal="24dp"
+        android:layout_marginTop="16dp"
+        android:text="@string/auto_dac"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="parent"
+        app:layout_constraintTop_toTopOf="parent" />
+
+    <TextView
+        android:id="@+id/tv_subtitle3"
+        style="@style/title2"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_marginHorizontal="24dp"
+
+        android:layout_marginTop="16dp"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@id/tv_subtitle2" />
+
+    <TextView
+        android:id="@+id/tv_subtitle4"
+        style="@style/title1_1"
+        android:layout_width="0dp"
+        android:layout_height="380dp"
+        android:layout_marginHorizontal="24dp"
+        android:layout_marginTop="16dp"
+        android:gravity="center"
+        android:text="Start"
+        android:textColor="@color/black"
+        android:textSize="11sp"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@id/tv_subtitle3" />
+
+
+    <Button
+        android:id="@+id/btn_submit"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginHorizontal="16dp"
+        android:layout_marginTop="24dp"
+        android:clickable="false"
+        android:gravity="center"
+        android:text="Start Auto DAC"
+        android:textColor="@color/white"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@id/tv_subtitle4" />
+
+    <Button
+        android:id="@+id/btn_read_dac"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginHorizontal="16dp"
+        android:layout_marginTop="24dp"
+        android:clickable="false"
+        android:gravity="center"
+        android:text="Read Current DAC Values"
+        android:textColor="@color/white"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@id/btn_submit" />
+
+    <!--        <Button-->
+    <!--            android:id="@+id/btn_read"-->
+    <!--            android:layout_width="wrap_content"-->
+    <!--            android:layout_height="wrap_content"-->
+    <!--            android:text="@string/read"-->
+    <!--            android:layout_margin="16dp"-->
+    <!--            android:clickable="false"-->
+    <!--            app:layout_constraintTop_toBottomOf="@id/btn_set_reference"-->
+    <!--            app:layout_constraintStart_toStartOf="parent" />-->
+
+    <!--            </androidx.constraintlayout.widget.ConstraintLayout>-->
+
+    <ImageView
+        android:id="@+id/iv_check"
+        android:visibility="gone"
+        android:layout_width="100dp"
+        android:layout_height="100dp"
+        android:layout_marginTop="40dp"
+        android:importantForAccessibility="no"
+        android:src="@drawable/check"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@id/btn_submit" />
+
+    <ProgressBar
+        android:id="@+id/progressBar"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_centerInParent="true"
+        android:elevation="12dp"
+        android:indeterminate="true"
+        android:indeterminateDrawable="@drawable/progressbar_drawable"
+        android:visibility="gone"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent" />
+
+
+</androidx.constraintlayout.widget.ConstraintLayout>

app/src/main/res/layout/fragment_gallery.xml

@@ -1,9 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
+    android:fillViewport="true">
+
+    <androidx.constraintlayout.widget.ConstraintLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
         tools:context="com.example.hpostesting.presentation.dashboard.GalleryFragment">
 
     <TextView
@@ -77,23 +82,9 @@
         app:cornerRadius="16dp"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@id/btn_deviceProvision" />
-
-    <com.google.android.material.button.MaterialButton
-        android:id="@+id/btn_deviceProvision"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:visibility="visible"
-        android:layout_marginHorizontal="16dp"
-        android:layout_marginTop="24dp"
-        android:clickable="false"
-        android:text="@string/deviceProvision"
-        android:textColor="@color/white"
-        app:cornerRadius="16dp"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@id/btn_auto_dac" />
 
+        
     <com.google.android.material.button.MaterialButton
         android:id="@+id/btn_deviceInfo"
         android:layout_width="match_parent"
@@ -108,6 +99,20 @@
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@id/btn_calibration" />
 
+        <com.google.android.material.button.MaterialButton
+            android:id="@+id/btn_deviceProvision"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:visibility="visible"
+            android:layout_marginHorizontal="16dp"
+            android:layout_marginTop="24dp"
+            android:clickable="false"
+            android:text="@string/deviceProvision"
+            android:textColor="@color/white"
+            app:cornerRadius="16dp"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@id/btn_deviceInfo" />
 
     <com.google.android.material.button.MaterialButton
         android:id="@+id/btn_firefox"
@@ -138,3 +143,4 @@
         app:layout_constraintTop_toBottomOf="@id/btn_firefox" />
 
 </androidx.constraintlayout.widget.ConstraintLayout>
+</ScrollView>