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

1. DCD 설정 시 Packet 0x41 고정으로 전송하도록 수정

Browse Source 
2. DCD 설정값 변경 후 ok 누르면 Packet 전송하여 설정되도록 수정
3. 부팅 시 DCD Packet 0x41 고정으로 전송하도록 수정
This commit is contained in:
StevenBuzzi
2026-03-06 10:31:03 +09:00
parent 8c85390d1e
commit 5ba515d123
2 changed files with 17 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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 )

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)) 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))
} }
// Example: Emitting an event after a delay // Example: Emitting an event after a delay