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

1. DCD Delay 설정 가능 범위 수정

Browse Source 
2. DCD Pressure 설정 기본값 수정
This commit is contained in:
StevenBuzzi
2026-03-05 18:32:29 +09:00
parent 72607b03a9
commit 8c85390d1e
2 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
app/src/main/java/com/laseroptek/raman/const/Pallas3Const.kt
View File

@@ -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 MAX_REFER1_VALUE = 99999999 // 8 byte ascii (ENERGY DETECT MEASURED VALUE)
const val DEFAULT_REFER1_VALUE = 0 // initial state 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_TIME = 10
const val DEFAULT_SPAY_DCD_DELAY = 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 dcdLifeSpanAdjustStringLists = dcdLifeSpanAdjustLists.map{ it.toString() }
val dcdSprayValues = listOf(10, 20, 30, 40, 50, 60, 70, 80, 90, 100).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 // default spray dcd list for options
val SprayDcdList = listOf<SprayDcd>( val SprayDcdList = listOf<SprayDcd>(
SprayDcd(status = 0x44, sprayTime = 10, sprayDelay = 10), // default SprayDcd(status = 0x41, sprayTime = 10, sprayDelay = 10), // default
SprayDcd(status = 0x44, sprayTime = 10, sprayDelay = 10), SprayDcd(status = 0x41, sprayTime = 10, sprayDelay = 10),
SprayDcd(status = 0x44, sprayTime = 20, sprayDelay = 20), SprayDcd(status = 0x41, sprayTime = 20, sprayDelay = 10),
SprayDcd(status = 0x44, sprayTime = 30, sprayDelay = 20), SprayDcd(status = 0x41, sprayTime = 30, sprayDelay = 20),
SprayDcd(status = 0x44, sprayTime = 40, sprayDelay = 40), SprayDcd(status = 0x41, sprayTime = 40, sprayDelay = 20),
SprayDcd(status = 0x44, sprayTime = 50, sprayDelay = 50), SprayDcd(status = 0x41, sprayTime = 50, sprayDelay = 30),
SprayDcd(status = 0x44, sprayTime = 60, sprayDelay = 60), SprayDcd(status = 0x41, sprayTime = 60, sprayDelay = 30),
) )
val PresetList = listOf<Preset>( val PresetList = listOf<Preset>(

2
app/src/main/java/com/laseroptek/raman/data/model/serial/DcdGas.kt
View File

@@ -3,7 +3,7 @@ package com.laseroptek.raman.data.model.serial
import com.laseroptek.raman.const.DEFAULT_DCD_GAS_PRESSURE import com.laseroptek.raman.const.DEFAULT_DCD_GAS_PRESSURE
data class DcdGas( 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 pressure: Float = DEFAULT_DCD_GAS_PRESSURE, // Ascii 4Byte (xx.x): Pressure
val ok: Int = 0x00, // 1Byte(N(0x4E): Not OK, O(0x00F): OK)/ val ok: Int = 0x00, // 1Byte(N(0x4E): Not OK, O(0x00F): OK)/
) )