Merge remote-tracking branch 'origin/Homocube' into Homocube

# Conflicts:
#	app/src/main/java/com/example/hpostesting/presentation/testRight/UsbService.kt
This commit is contained in:
smileomi18@gmail.com
2023-07-20 15:44:43 +05:30

View File

@@ -76,7 +76,8 @@ class TestRightExpReference : Fragment() {
}
override fun onClickPositiveButton() {
startTakingReference()
// startTakingReference()
fetchHemoCubeResult()
}
})
}
@@ -125,14 +126,14 @@ class TestRightExpReference : Fragment() {
viewModel.progressBar.postValue(true)
val fullReadOutput = StringBuilder()
(activity as TestRightActivity).mService.eventDrivenWrite(TestRightCommands.read,
(activity as TestRightActivity).mService.eventDrivenWrite2(
object : UsbServiceListener {
override fun onUsbRead(data: ByteArray?) {
Log.d("mariya", data.toString())
data?.let {
val stringData = String(it)
fullReadOutput.append(stringData)
Log.d(TAG, "fullReadOutput = $fullReadOutput")
Log.d("mariya", "fullReadOutput = $fullReadOutput")
if (stringData.contains("OK", true)) {
Log.d(