Compare commits

2 Commits

Author SHA1 Message Date
StevenBuzzi
c1273bd924 Merge remote-tracking branch 'origin/feature/ISSUE-51' into feature/ISSUE-51
# Conflicts:
#	app/src/main/java/com/laseroptek/raman/ui/screens/main/MainViewModel.kt
2026-03-06 11:55:53 +09:00
StevenBuzzi
56c516dec7 Merge remote-tracking branch 'origin/feature/ISSUE-51' into feature/ISSUE-51
# Conflicts:
#	app/src/main/java/com/laseroptek/raman/ui/screens/main/MainViewModel.kt
2026-03-06 11:54:55 +09:00

View File

@@ -842,8 +842,9 @@ class MainViewModel @Inject constructor(
// tx DCD_GAS Write (DEFAULT VALUE)
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.copy(status = 0x41))
// tx SPRAY_DCD Write (DEFAULT VALUE)
txPacket(READ_WRITE.WRITE, CMD.SPRAY_DCD, sprayDcd.value.copy(status = 0x41))
}
}
private suspend fun waitUntilSerialReady(