2 Commits

Author SHA1 Message Date
StevenBuzzi
8c85390d1e 1. DCD Delay 설정 가능 범위 수정
2. DCD Pressure 설정 기본값 수정
2026-03-05 18:32:29 +09:00
StevenBuzzi
72607b03a9 Home화면 내 DCD 숫자 표시 위치 및 크기 조정 2026-03-05 16:19:48 +09:00
3 changed files with 13 additions and 13 deletions

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>(

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)/
) )

View File

@@ -97,7 +97,7 @@ fun DcdView(
Column( Column(
modifier = Modifier modifier = Modifier
.width(45.px.dp) .width(55.px.dp)
.fillMaxHeight() .fillMaxHeight()
, horizontalAlignment = Alignment.CenterHorizontally , horizontalAlignment = Alignment.CenterHorizontally
, verticalArrangement = Arrangement.Center , verticalArrangement = Arrangement.Center
@@ -120,7 +120,7 @@ fun DcdView(
) )
} }
Spacer( Modifier.width(10.px.dp)) Spacer( Modifier.width(5.px.dp))
VerticalDivider( VerticalDivider(
color = Color(161,161,170), color = Color(161,161,170),
@@ -128,7 +128,7 @@ fun DcdView(
modifier = Modifier.size(1.px.dp, 30.px.dp) modifier = Modifier.size(1.px.dp, 30.px.dp)
) )
Spacer( Modifier.width(10.px.dp)) Spacer( Modifier.width(5.px.dp))
// Delay // Delay
Timber.d("selectedSprayDcdIndex.value: ${selectedSprayDcdIndex}") Timber.d("selectedSprayDcdIndex.value: ${selectedSprayDcdIndex}")