diff --git a/app/src/main/java/com/laseroptek/raman/const/Pallas3Const.kt b/app/src/main/java/com/laseroptek/raman/const/Pallas3Const.kt index fc16e44..986ddff 100644 --- a/app/src/main/java/com/laseroptek/raman/const/Pallas3Const.kt +++ b/app/src/main/java/com/laseroptek/raman/const/Pallas3Const.kt @@ -61,7 +61,7 @@ const val MAX_Q_SWITCH_VALUE = 250.0f const val MAX_REFER1_VALUE = 99999999 // 8 byte ascii (ENERGY DETECT MEASURED VALUE) const val DEFAULT_REFER1_VALUE = 0 // initial state -const val DEFAULT_DCD_GAS_PRESSURE = 06.5f +const val DEFAULT_DCD_GAS_PRESSURE = 08.0f const val DEFAULT_SPAY_DCD_TIME = 10 const val DEFAULT_SPAY_DCD_DELAY = 10 @@ -461,17 +461,17 @@ val dcdLifeSpanAdjustLists = listOf( 0.5f, 0.7f, 0.9f, 1.0f, 1.1f, 1.2f ) val dcdLifeSpanAdjustStringLists = dcdLifeSpanAdjustLists.map{ it.toString() } val dcdSprayValues = listOf(10, 20, 30, 40, 50, 60, 70, 80, 90, 100).map{ it.toString() } -val dcdDelayValues = listOf(10, 20, 30, 40, 50, 60, 70, 80, 90, 100).map{ it.toString() } +val dcdDelayValues = listOf(10, 20, 30, 40).map{ it.toString() } // default spray dcd list for options val SprayDcdList = listOf( - SprayDcd(status = 0x44, sprayTime = 10, sprayDelay = 10), // default - SprayDcd(status = 0x44, sprayTime = 10, sprayDelay = 10), - SprayDcd(status = 0x44, sprayTime = 20, sprayDelay = 20), - SprayDcd(status = 0x44, sprayTime = 30, sprayDelay = 20), - SprayDcd(status = 0x44, sprayTime = 40, sprayDelay = 40), - SprayDcd(status = 0x44, sprayTime = 50, sprayDelay = 50), - SprayDcd(status = 0x44, sprayTime = 60, sprayDelay = 60), + SprayDcd(status = 0x41, sprayTime = 10, sprayDelay = 10), // default + SprayDcd(status = 0x41, sprayTime = 10, sprayDelay = 10), + SprayDcd(status = 0x41, sprayTime = 20, sprayDelay = 10), + SprayDcd(status = 0x41, sprayTime = 30, sprayDelay = 20), + SprayDcd(status = 0x41, sprayTime = 40, sprayDelay = 20), + SprayDcd(status = 0x41, sprayTime = 50, sprayDelay = 30), + SprayDcd(status = 0x41, sprayTime = 60, sprayDelay = 30), ) val PresetList = listOf( diff --git a/app/src/main/java/com/laseroptek/raman/data/model/serial/DcdGas.kt b/app/src/main/java/com/laseroptek/raman/data/model/serial/DcdGas.kt index e6eb259..bf7690f 100644 --- a/app/src/main/java/com/laseroptek/raman/data/model/serial/DcdGas.kt +++ b/app/src/main/java/com/laseroptek/raman/data/model/serial/DcdGas.kt @@ -3,7 +3,7 @@ package com.laseroptek.raman.data.model.serial import com.laseroptek.raman.const.DEFAULT_DCD_GAS_PRESSURE data class DcdGas( - val status: Int = 0x41, // 1Byte(A(0x41): on, D(0x44): off, P(0x50): pressure) + val status: Int = 0x50, // 1Byte(A(0x41): on, D(0x44): off, P(0x50): pressure) val pressure: Float = DEFAULT_DCD_GAS_PRESSURE, // Ascii 4Byte (xx.x): Pressure val ok: Int = 0x00, // 1Byte(N(0x4E): Not OK, O(0x00F): OK)/ ) diff --git a/app/src/main/java/com/laseroptek/raman/ui/screens/home/dcd/DcdSettingPopup.kt b/app/src/main/java/com/laseroptek/raman/ui/screens/home/dcd/DcdSettingPopup.kt index 5bd631c..a34a4cd 100644 --- a/app/src/main/java/com/laseroptek/raman/ui/screens/home/dcd/DcdSettingPopup.kt +++ b/app/src/main/java/com/laseroptek/raman/ui/screens/home/dcd/DcdSettingPopup.kt @@ -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 ) diff --git a/app/src/main/java/com/laseroptek/raman/ui/screens/home/dcd/DcdView.kt b/app/src/main/java/com/laseroptek/raman/ui/screens/home/dcd/DcdView.kt index 646bbec..f88d536 100644 --- a/app/src/main/java/com/laseroptek/raman/ui/screens/home/dcd/DcdView.kt +++ b/app/src/main/java/com/laseroptek/raman/ui/screens/home/dcd/DcdView.kt @@ -97,7 +97,7 @@ fun DcdView( Column( modifier = Modifier - .width(45.px.dp) + .width(55.px.dp) .fillMaxHeight() , horizontalAlignment = Alignment.CenterHorizontally , verticalArrangement = Arrangement.Center @@ -120,7 +120,7 @@ fun DcdView( ) } - Spacer( Modifier.width(10.px.dp)) + Spacer( Modifier.width(5.px.dp)) VerticalDivider( color = Color(161,161,170), @@ -128,7 +128,7 @@ fun DcdView( modifier = Modifier.size(1.px.dp, 30.px.dp) ) - Spacer( Modifier.width(10.px.dp)) + Spacer( Modifier.width(5.px.dp)) // Delay Timber.d("selectedSprayDcdIndex.value: ${selectedSprayDcdIndex}") diff --git a/app/src/main/java/com/laseroptek/raman/ui/screens/main/MainViewModel.kt b/app/src/main/java/com/laseroptek/raman/ui/screens/main/MainViewModel.kt index 41401c9..46def97 100644 --- a/app/src/main/java/com/laseroptek/raman/ui/screens/main/MainViewModel.kt +++ b/app/src/main/java/com/laseroptek/raman/ui/screens/main/MainViewModel.kt @@ -843,7 +843,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)) } }