steven/raman
1
1
Fork 0
Code Issues 20 Pull Requests 1 Actions Packages Releases Wiki Activity

DCD 설정 관련 이슈 해결 #53

Closed
steven wants to merge 9 commits from feature/ISSUE-51 into develop
pull from: feature/ISSUE-51
merge into: steven:develop
Conversation 0 Commits 9 Files Changed 5 +7 -3
1 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 56c516dec7 - Show all commits

10
app/src/main/java/com/laseroptek/raman/ui/screens/main/MainViewModel.kt
View File

@@ -819,7 +819,10 @@ class MainViewModel @Inject constructor(
// Because serial open() is started in rxPacketLoop() asynchronously, // Because serial open() is started in rxPacketLoop() asynchronously,
// FD can still be -1 here (startup race). Wait briefly before first TX burst. // FD can still be -1 here (startup race). Wait briefly before first TX burst.
if (!waitUntilSerialReady()) { if (!waitUntilSerialReady()) {
Timber.e("txPacketOnce skipped: serial port is not ready (fd=%d)", serialPortRepository.getFD()) Timber.e(
"txPacketOnce skipped: serial port is not ready (fd=%d)",
serialPortRepository.getFD()
)
return@launch return@launch
} }
@@ -842,8 +845,9 @@ class MainViewModel @Inject constructor(
// tx DCD_GAS Write (DEFAULT VALUE) // tx DCD_GAS Write (DEFAULT VALUE)
txPacket(READ_WRITE.WRITE, CMD.DCD_GAS, dcdGas.value.copy(status = 0x50)) txPacket(READ_WRITE.WRITE, CMD.DCD_GAS, dcdGas.value.copy(status = 0x50))
// tx SPRAY_DCD Write (DEFAULT VALUE) // tx SPRAY_DCD Write (DEFAULT VALUE)
txPacket(READ_WRITE.WRITE, CMD.SPRAY_DCD, sprayDcd.value.copy(status = 0x41)) txPacket(READ_WRITE.WRITE, CMD.SPRAY_DCD, sprayDcd.value.copy(status = 0x41))
}
} }
private suspend fun waitUntilSerialReady( private suspend fun waitUntilSerialReady(