diff --git a/app/src/main/java/com/example/hpostesting/data/constant/HemoCubeCommands.kt b/app/src/main/java/com/example/hpostesting/data/constant/HemoCubeCommands.kt index 95e9b73..5edd02b 100644 --- a/app/src/main/java/com/example/hpostesting/data/constant/HemoCubeCommands.kt +++ b/app/src/main/java/com/example/hpostesting/data/constant/HemoCubeCommands.kt @@ -3,6 +3,7 @@ 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"), diff --git a/app/src/main/java/com/example/hpostesting/presentation/autodac/AutoDacActivity.kt b/app/src/main/java/com/example/hpostesting/presentation/autodac/AutoDacActivity.kt index bf68427..3da5def 100644 --- a/app/src/main/java/com/example/hpostesting/presentation/autodac/AutoDacActivity.kt +++ b/app/src/main/java/com/example/hpostesting/presentation/autodac/AutoDacActivity.kt @@ -58,7 +58,6 @@ class AutoDacActivity : AppCompatActivity() { DataHolder.usbConnected.postValue(true) } } - } } diff --git a/app/src/main/java/com/example/hpostesting/presentation/autodac/AutoDacFragment.kt b/app/src/main/java/com/example/hpostesting/presentation/autodac/AutoDacFragment.kt index 2fb36b2..3981dd8 100644 --- a/app/src/main/java/com/example/hpostesting/presentation/autodac/AutoDacFragment.kt +++ b/app/src/main/java/com/example/hpostesting/presentation/autodac/AutoDacFragment.kt @@ -112,6 +112,20 @@ class AutoDacFragment : Fragment() { }) } + 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 listenToHemoCube() { val fullReadOutput = StringBuilder() @@ -143,6 +157,8 @@ class AutoDacFragment : Fragment() { } if (resultData.contains("#CC")) { + setAutoDacValuesCommand() + autoDacViewModel.addAutoDacDataToDb( DiagnosticsData( deviceId = sharedPreferences.getString(Constants.DEVICE_ID, "") @@ -169,6 +185,10 @@ class AutoDacFragment : Fragment() { binding.ivCheck.visibility = View.VISIBLE } } + + if (resultData.contains("#WS")) { + showToast("DAC Values saved to EPROM") + } } override fun onUsbError(e: Exception?) { diff --git a/app/src/main/java/com/example/hpostesting/presentation/blank/BlankActivity.kt b/app/src/main/java/com/example/hpostesting/presentation/blank/BlankActivity.kt new file mode 100644 index 0000000..976d371 --- /dev/null +++ b/app/src/main/java/com/example/hpostesting/presentation/blank/BlankActivity.kt @@ -0,0 +1,4 @@ +package com.example.hpostesting.presentation.blank + +class BlankActivity { +} \ No newline at end of file diff --git a/app/src/main/java/com/example/hpostesting/presentation/blank/BlankFragment.kt b/app/src/main/java/com/example/hpostesting/presentation/blank/BlankFragment.kt new file mode 100644 index 0000000..ee4110a --- /dev/null +++ b/app/src/main/java/com/example/hpostesting/presentation/blank/BlankFragment.kt @@ -0,0 +1,4 @@ +package com.example.hpostesting.presentation.blank + +class BlankFragment { +} \ No newline at end of file diff --git a/app/src/main/java/com/example/hpostesting/presentation/blank/BlankViewModel.kt b/app/src/main/java/com/example/hpostesting/presentation/blank/BlankViewModel.kt new file mode 100644 index 0000000..5d90f7f --- /dev/null +++ b/app/src/main/java/com/example/hpostesting/presentation/blank/BlankViewModel.kt @@ -0,0 +1,4 @@ +package com.example.hpostesting.presentation.blank + +class BlankViewModel { +} \ No newline at end of file diff --git a/app/src/main/java/com/example/hpostesting/presentation/diagnostics/DiagnosticsFragment.kt b/app/src/main/java/com/example/hpostesting/presentation/diagnostics/DiagnosticsFragment.kt index 48ed0ad..9344881 100644 --- a/app/src/main/java/com/example/hpostesting/presentation/diagnostics/DiagnosticsFragment.kt +++ b/app/src/main/java/com/example/hpostesting/presentation/diagnostics/DiagnosticsFragment.kt @@ -108,8 +108,6 @@ class DiagnosticsFragment : Fragment() { HemoCubeCommands.DIAGNOSTICS_COMMAND, object : UsbServiceListener { override fun onUsbRead(data: ByteArray?) { - - } override fun onUsbError(e: Exception?) {