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

DCD 설정 관련 수정 #55

Merged
steven merged 7 commits from feature/ISSUE-51 into develop 2026-03-06 04:43:57 +00:00
Conversation 0 Commits 7 Files Changed 5 +17 -3
2 changed files with 17 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 5ba515d123 - 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)
val optionValue = mainViewModel.sprayDcdList[i]
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 {
mainViewModel.saveSprayDcdIndexToPreference()
@@ -303,7 +307,11 @@ fun DcdSettingPopup(
mainViewModel.setSelectedSprayDcdIndex(i)
val optionValue = mainViewModel.sprayDcdList[i]
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 {
mainViewModel.saveSprayDcdToPreference()
@@ -603,6 +611,12 @@ fun DcdSettingPopup(
sprayDcd
)
mainViewModel.txPacket(
READ_WRITE.WRITE,
CMD.SPRAY_DCD,
sprayDcd.copy(status = 0x41)
)
mainViewModel.setSelectedSprayDcdIndex( selectedSprayDcdIndex )
//mainViewModel.setSprayDcdList( mainViewModel.sprayDcdList )

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

@@ -831,7 +831,7 @@ class MainViewModel @Inject constructor(
txPacket(READ_WRITE.WRITE, CMD.DCD_GAS, dcdGas.value.copy(status = 0x50))
// 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))
}
// Example: Emitting an event after a delay