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 +18 -5
2 changed files with 18 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 1bc8beadda - Show all commits

18
app/src/main/java/com/laseroptek/raman/ui/screens/home/dcd/DcdSettingPopup.kt
View File

@@ -256,7 +256,11 @@ fun DcdSettingPopup(
mainViewModel.setSelectedSprayDcdIndex(i) mainViewModel.setSelectedSprayDcdIndex(i)
val optionValue = mainViewModel.sprayDcdList[i] val optionValue = mainViewModel.sprayDcdList[i]
mainViewModel.setSprayDcd(optionValue) mainViewModel.setSprayDcd(optionValue)
mainViewModel.txPacket(READ_WRITE.WRITE, CMD.SPRAY_DCD, optionValue) mainViewModel.txPacket(
READ_WRITE.WRITE,
CMD.SPRAY_DCD,
optionValue.copy(status = 0x41)
)
scope.launch { scope.launch {
mainViewModel.saveSprayDcdIndexToPreference() mainViewModel.saveSprayDcdIndexToPreference()
@@ -303,7 +307,11 @@ fun DcdSettingPopup(
mainViewModel.setSelectedSprayDcdIndex(i) mainViewModel.setSelectedSprayDcdIndex(i)
val optionValue = mainViewModel.sprayDcdList[i] val optionValue = mainViewModel.sprayDcdList[i]
mainViewModel.setSprayDcd(optionValue) mainViewModel.setSprayDcd(optionValue)
mainViewModel.txPacket(READ_WRITE.WRITE, CMD.SPRAY_DCD, optionValue) mainViewModel.txPacket(
READ_WRITE.WRITE,
CMD.SPRAY_DCD,
optionValue.copy(status = 0x41)
)
scope.launch { scope.launch {
mainViewModel.saveSprayDcdToPreference() mainViewModel.saveSprayDcdToPreference()
@@ -603,6 +611,12 @@ fun DcdSettingPopup(
sprayDcd sprayDcd
) )
mainViewModel.txPacket(
READ_WRITE.WRITE,
CMD.SPRAY_DCD,
sprayDcd.copy(status = 0x41)
)
mainViewModel.setSelectedSprayDcdIndex( selectedSprayDcdIndex ) mainViewModel.setSelectedSprayDcdIndex( selectedSprayDcdIndex )
//mainViewModel.setSprayDcdList( mainViewModel.sprayDcdList ) //mainViewModel.setSprayDcdList( mainViewModel.sprayDcdList )

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

@@ -842,9 +842,8 @@ 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) txPacket(READ_WRITE.WRITE, CMD.SPRAY_DCD, sprayDcd.value.copy(status = 0x41))
}
} }
private suspend fun waitUntilSerialReady( private suspend fun waitUntilSerialReady(