From 8c85390d1ea08dc78343b878eea0ba5d38cfcc86 Mon Sep 17 00:00:00 2001 From: StevenBuzzi Date: Thu, 5 Mar 2026 18:32:29 +0900 Subject: [PATCH] =?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)/ )