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

Added baud rate

Browse Source
This commit is contained in:
Mariya
2024-01-22 14:51:24 +05:30
parent b139289765
commit a0fc7f7be4
4 changed files with 22 additions and 153 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -377,7 +377,7 @@ class HemoCubeFragment : Fragment() {
hemoCubeViewModel.deviceMessages.postValue(currentResultData)
when {
resultData.contains("SNE") && this.testStatusCode < TestStatus.CONFIG_COMPLETED.code -> {
(resultData.contains("SNE") || resultData.contains("SN"))&& this.testStatusCode < TestStatus.CONFIG_COMPLETED.code -> {
processHardwareId(resultData)
}
@@ -394,7 +394,7 @@ class HemoCubeFragment : Fragment() {
}
}
resultData.contains("#SS1") && this.testStatusCode < TestStatus.SAMPLE_STARTED.code -> {
resultData.contains("#SS") && this.testStatusCode < TestStatus.SAMPLE_STARTED.code -> {
this.testStatusCode = TestStatus.SAMPLE_STARTED.code
activity?.runOnUiThread {
binding.tvSubtitle4.text = getString(R.string.sample_started)
@@ -402,7 +402,7 @@ class HemoCubeFragment : Fragment() {
}
}
resultData.contains("#SC1") && this.testStatusCode < TestStatus.SAMPLE_COMPLETED.code -> {
resultData.contains("#SC") && 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))
@@ -574,7 +574,7 @@ class HemoCubeFragment : Fragment() {
}
fun processHardwareId(resultData: String) {
val hardwareId = extractMiddleString(resultData)
val hardwareId = "HCV-000-3001" //extractMiddleString(resultData)
if (!hardwareId.isNullOrBlank()) {
updateDeviceId(hardwareId)

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

@@ -34,7 +34,7 @@ class UsbService : Service() {
fun connect(driver: UsbSerialDriver, connection: UsbDeviceConnection) {
mPort = driver.ports[0] // Most devices have just one port (port 0)
mPort.open(connection)
mPort.setParameters(115200, 8, UsbSerialPort.STOPBITS_1, UsbSerialPort.PARITY_NONE)
mPort.setParameters(9600, 8, UsbSerialPort.STOPBITS_1, UsbSerialPort.PARITY_NONE)
isUsbConnected = true
Log.d(TAG, "My Usb Connected ${mPort.driver}")