From 72607b03a92a0073e01b9ebcad955b5d4c9ad4ff Mon Sep 17 00:00:00 2001 From: StevenBuzzi Date: Thu, 5 Mar 2026 16:19:48 +0900 Subject: [PATCH 1/6] =?UTF-8?q?Home=ED=99=94=EB=A9=B4=20=EB=82=B4=20DCD=20?= =?UTF-8?q?=EC=88=AB=EC=9E=90=20=ED=91=9C=EC=8B=9C=20=EC=9C=84=EC=B9=98=20?= =?UTF-8?q?=EB=B0=8F=20=ED=81=AC=EA=B8=B0=20=EC=A1=B0=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/laseroptek/raman/ui/screens/home/dcd/DcdView.kt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) 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}") -- 2.47.3 From 8c85390d1ea08dc78343b878eea0ba5d38cfcc86 Mon Sep 17 00:00:00 2001 From: StevenBuzzi Date: Thu, 5 Mar 2026 18:32:29 +0900 Subject: [PATCH 2/6] =?UTF-8?q?1.=20DCD=20Delay=20=EC=84=A4=EC=A0=95=20?= =?UTF-8?q?=EA=B0=80=EB=8A=A5=20=EB=B2=94=EC=9C=84=20=EC=88=98=EC=A0=95=20?= =?UTF-8?q?2.=20DCD=20Pressure=20=EC=84=A4=EC=A0=95=20=EA=B8=B0=EB=B3=B8?= =?UTF-8?q?=EA=B0=92=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/laseroptek/raman/const/Pallas3Const.kt | 18 +++++++++--------- .../raman/data/model/serial/DcdGas.kt | 2 +- 2 files changed, 10 insertions(+), 10 deletions(-) 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)/ ) -- 2.47.3 From 5ba515d123c03b5b7739aa72a28b8e17f3696cd6 Mon Sep 17 00:00:00 2001 From: StevenBuzzi Date: Fri, 6 Mar 2026 10:31:03 +0900 Subject: [PATCH 3/6] =?UTF-8?q?1.=20DCD=20=EC=84=A4=EC=A0=95=20=EC=8B=9C?= =?UTF-8?q?=20Packet=200x41=20=EA=B3=A0=EC=A0=95=EC=9C=BC=EB=A1=9C=20?= =?UTF-8?q?=EC=A0=84=EC=86=A1=ED=95=98=EB=8F=84=EB=A1=9D=20=EC=88=98?= =?UTF-8?q?=EC=A0=95=202.=20DCD=20=EC=84=A4=EC=A0=95=EA=B0=92=20=EB=B3=80?= =?UTF-8?q?=EA=B2=BD=20=ED=9B=84=20ok=20=EB=88=84=EB=A5=B4=EB=A9=B4=20Pack?= =?UTF-8?q?et=20=EC=A0=84=EC=86=A1=ED=95=98=EC=97=AC=20=EC=84=A4=EC=A0=95?= =?UTF-8?q?=EB=90=98=EB=8F=84=EB=A1=9D=20=EC=88=98=EC=A0=95=203.=20?= =?UTF-8?q?=EB=B6=80=ED=8C=85=20=EC=8B=9C=20DCD=20Packet=200x41=20?= =?UTF-8?q?=EA=B3=A0=EC=A0=95=EC=9C=BC=EB=A1=9C=20=EC=A0=84=EC=86=A1?= =?UTF-8?q?=ED=95=98=EB=8F=84=EB=A1=9D=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ui/screens/home/dcd/DcdSettingPopup.kt | 18 ++++++++++++++++-- .../raman/ui/screens/main/MainViewModel.kt | 2 +- 2 files changed, 17 insertions(+), 3 deletions(-) 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/main/MainViewModel.kt b/app/src/main/java/com/laseroptek/raman/ui/screens/main/MainViewModel.kt index b5a5063..bcdf150 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 @@ -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 -- 2.47.3 From d2e375b305756242df181711137f64ffa28f7ec3 Mon Sep 17 00:00:00 2001 From: StevenBuzzi Date: Thu, 5 Mar 2026 16:19:48 +0900 Subject: [PATCH 4/6] =?UTF-8?q?Home=ED=99=94=EB=A9=B4=20=EB=82=B4=20DCD=20?= =?UTF-8?q?=EC=88=AB=EC=9E=90=20=ED=91=9C=EC=8B=9C=20=EC=9C=84=EC=B9=98=20?= =?UTF-8?q?=EB=B0=8F=20=ED=81=AC=EA=B8=B0=20=EC=A1=B0=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/laseroptek/raman/ui/screens/home/dcd/DcdView.kt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) 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}") -- 2.47.3 From 71ab4cc8d8ce4eb9ed5161e8167570584fb92b57 Mon Sep 17 00:00:00 2001 From: StevenBuzzi Date: Thu, 5 Mar 2026 18:32:29 +0900 Subject: [PATCH 5/6] =?UTF-8?q?1.=20DCD=20Delay=20=EC=84=A4=EC=A0=95=20?= =?UTF-8?q?=EA=B0=80=EB=8A=A5=20=EB=B2=94=EC=9C=84=20=EC=88=98=EC=A0=95=20?= =?UTF-8?q?2.=20DCD=20Pressure=20=EC=84=A4=EC=A0=95=20=EA=B8=B0=EB=B3=B8?= =?UTF-8?q?=EA=B0=92=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/laseroptek/raman/const/Pallas3Const.kt | 18 +++++++++--------- .../raman/data/model/serial/DcdGas.kt | 2 +- 2 files changed, 10 insertions(+), 10 deletions(-) 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)/ ) -- 2.47.3 From 174cb4fb456c7c2b2166c4111fa6b9300669e91e Mon Sep 17 00:00:00 2001 From: StevenBuzzi Date: Fri, 6 Mar 2026 10:31:03 +0900 Subject: [PATCH 6/6] =?UTF-8?q?1.=20DCD=20=EC=84=A4=EC=A0=95=20=EC=8B=9C?= =?UTF-8?q?=20Packet=200x41=20=EA=B3=A0=EC=A0=95=EC=9C=BC=EB=A1=9C=20?= =?UTF-8?q?=EC=A0=84=EC=86=A1=ED=95=98=EB=8F=84=EB=A1=9D=20=EC=88=98?= =?UTF-8?q?=EC=A0=95=202.=20DCD=20=EC=84=A4=EC=A0=95=EA=B0=92=20=EB=B3=80?= =?UTF-8?q?=EA=B2=BD=20=ED=9B=84=20ok=20=EB=88=84=EB=A5=B4=EB=A9=B4=20Pack?= =?UTF-8?q?et=20=EC=A0=84=EC=86=A1=ED=95=98=EC=97=AC=20=EC=84=A4=EC=A0=95?= =?UTF-8?q?=EB=90=98=EB=8F=84=EB=A1=9D=20=EC=88=98=EC=A0=95=203.=20?= =?UTF-8?q?=EB=B6=80=ED=8C=85=20=EC=8B=9C=20DCD=20Packet=200x41=20?= =?UTF-8?q?=EA=B3=A0=EC=A0=95=EC=9C=BC=EB=A1=9C=20=EC=A0=84=EC=86=A1?= =?UTF-8?q?=ED=95=98=EB=8F=84=EB=A1=9D=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ui/screens/home/dcd/DcdSettingPopup.kt | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) 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 ) -- 2.47.3