Merge pull request 'H/P 연결할 때마다 Lifetime 기준값이 1씩 증가하는 버그 수정' (#64) from feature/ISSUE-14,15 into develop

Reviewed-on: #64

README.md

@@ -214,3 +214,10 @@
   - `loadFluenceTable()`, `loadHzTable()`, `calculateInterpolatedC()` 영향 확인
 - 성능/안정성 이슈 시
   - `txPacketLoop()` 주기, `RX_TIMEOUT_THRESHOLD`, DB 로그 적재량 점검
+
+## 10) Troubleshooting
+
+- 시리얼 초기 TX 누락(Startup race, FD 설명, 수정 내역):
+  - [`docs/serial_tx_startup_race.md`](docs/serial_tx_startup_race.md)
+- 변경 요약 문서(`git diff` 기준):
+  - [`docs/change_summary_2026-03-04.md`](docs/change_summary_2026-03-04.md)

app/src/main/java/com/laseroptek/raman/const/HzTable_10_10.kt

@@ -9,7 +9,7 @@ package com.laseroptek.raman.const
 
 val HzTable_10_10 = mapOf(
     // Pulse Width = 0.5f
-    Pair(0.5f, 0.5f) to KEY_BLUE,
+    Pair(0.5f, 0.5f) to KEY_GREEN,
     Pair(0.5f, 0.6f) to KEY_BLUE,
     Pair(0.5f, 0.7f) to KEY_BLUE,
     Pair(0.5f, 0.8f) to KEY_BLUE,

app/src/main/java/com/laseroptek/raman/const/HzTable_5_5.kt

@@ -24,7 +24,7 @@ val HzTable_5_5 = mapOf(
     Pair(0.5f,3.4f) to KEY_BLUE,
     Pair(0.5f,3.6f) to KEY_BLUE,
     Pair(0.5f,3.8f) to KEY_BLUE,
-    Pair(0.5f,4.0f) to KEY_YELLOW,
+    Pair(0.5f,4.0f) to KEY_BLUE,
     Pair(0.5f,4.2f) to KEY_YELLOW,
     Pair(0.5f,4.4f) to KEY_YELLOW,
     Pair(0.5f,4.6f) to KEY_YELLOW,

app/src/main/java/com/laseroptek/raman/const/HzTable_7_7.kt

@@ -108,7 +108,7 @@ val HzTable_7_7 = mapOf(
     Pair(1.5f, 8.0f) to KEY_GRAY,
 
     // Pulse Width = 3f
-    Pair(3f, 1.1f) to KEY_RED,
+    Pair(3f, 1.1f) to KEY_GRAY,
     Pair(3f, 1.2f) to KEY_GRAY,
     Pair(3f, 1.3f) to KEY_GRAY,
     Pair(3f, 1.4f) to KEY_GRAY,

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

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

app/src/main/java/com/laseroptek/raman/data/model/serial/HandPiece.kt

@@ -1,5 +1,5 @@
 package com.laseroptek.raman.data.model.serial
 
 data class HandPiece(
-    val type:Int = 1  // ascii (00 ~ 99)
+    val type:Int = 0  // ascii (00 ~ 99)
 )

app/src/main/java/com/laseroptek/raman/ui/MainActivity.kt

@@ -260,9 +260,11 @@ class MainActivity : ComponentActivity() {
                     // This prevents serial interrupts from stealing CPU during the first frame.
                     delay(200)
 
-                    vm.txPacketOnce()
+                    // IMPORTANT:
-
+                    // rxPacketLoop() starts serial open() asynchronously.
+                    // Start RX first so txPacketOnce() is less likely to run before FD is ready.
                     vm.rxPacketLoop()
+                    vm.txPacketOnce()
                     vm.txPacketLoop()
 
                     Timber.d("System fully operational.")

app/src/main/java/com/laseroptek/raman/ui/screens/engineer/LifeTimeView.kt

@@ -58,7 +58,7 @@ fun LifeTimeView(
         Spacer(modifier = Modifier.height(2.px.dp))
 
         // Temp 0..7
-        for (i in 0..lifeTimeTypes.size -1) {
+        for (i in 0..lifeTimeTypes.size - 1) {
             val value = when (i) {
                 0 -> lifeTime.lamp
                 1 -> lifeTime.hp5x5

app/src/main/java/com/laseroptek/raman/ui/screens/home/HomeScreen.kt

@@ -304,7 +304,7 @@ fun HomeScreen(
                     pulseType = pulseType,
                     handPieceType = handPiece.type,
                     type = LaserStatusType.REPETITION,
-                    angle = if (pulseType == 0 || repetitionList.size < 2) 0f else repetitionAngle,
+                    angle = if (pulseType == 0 || repetitionList.isEmpty()) 0f else repetitionAngle,
                     onChange = { angle ->
                         if (handPiece.type == 0) {
                             Toast.makeText(
@@ -315,7 +315,7 @@ fun HomeScreen(
                             return@LaserControlView
                         }
 
-                        if (pulseType == 0 || repetitionList.size < 2) {
+                        if (pulseType == 0 || repetitionList.isEmpty()) {
                             //Toast.makeText(context, "Single pulse type (0 Hz)", Toast.LENGTH_SHORT).show()
                         } else {
                             mainViewModel.onChangeRepetition(angle)
@@ -332,7 +332,7 @@ fun HomeScreen(
                             return@LaserControlView
                         }
 
-                        if (pulseType == 0 || repetitionList.size < 2) {
+                        if (pulseType == 0 || repetitionList.isEmpty()) {
                             //Toast.makeText(context, "Single pulse type (0 Hz)", Toast.LENGTH_SHORT).show()
                         } else {
                             //mainViewModel.onClickRepetition(state)

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 )
 

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}")

app/src/main/java/com/laseroptek/raman/ui/screens/home/preset/PresetLoadPopup.kt

@@ -780,21 +780,25 @@ fun PresetLoadPopup(
                                 .noRippleClickable(onClick = {
                                     Timber.d("onClick - Preset Load")
 
-                                    val selectedPreset =
+                                    val selectedPreset = presetViewModel.getPreset(selectedPresetIndex)
-                                        presetViewModel.getPreset(selectedPresetIndex)
+                                    if (selectedPreset == null) {
-                                    val priority =
+                                        Timber.w("onClick - Preset Load: selectedPreset is null. index=$selectedPresetIndex")
-                                        selectedPreset?.priority ?: 0
+                                        return@noRippleClickable
+                                    }
+                                    val priority = selectedPreset.priority
 
                                     Timber.d("onClick - Preset Load ($priority)")
 
-//                                    if (priority > 0) {   // TODO : 검증 필요
+                                    if (priority > 0) {
                                         mainViewModel.setSelectedPresetIndex( priority )
                                         mainViewModel.applyPreset(priority)
+                                    } else {
+                                        // 우선순위가 NONE인 경우, 인덱스 설정 X
+                                        mainViewModel.setSelectedPresetIndex(0)
+                                        mainViewModel.applyPreset(selectedPreset)
+                                    }
                                     presetViewModel.clearPreset()
                                     onClick.invoke(false)
-//                                    } else {
-//                                        Timber.d("SKIP - Preset Load ($priority)")
-//                                    }
                                 })
                                 .size(40.px.dp)
                                 .background(Color.Transparent)

app/src/main/java/com/laseroptek/raman/ui/screens/main/MainViewModel.kt

@@ -134,6 +134,7 @@ import kotlinx.coroutines.joinAll
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.withContext
 import timber.log.Timber
+import kotlin.math.abs
 import javax.inject.Inject
 import kotlin.experimental.or
 import kotlin.time.Duration.Companion.milliseconds
@@ -814,6 +815,15 @@ class MainViewModel @Inject constructor(
     }
 
     fun txPacketOnce() {
+        viewModelScope.launch(dispatcherProvider.io) {
+            // txPacketOnce is called during app startup.
+            // Because serial open() is started in rxPacketLoop() asynchronously,
+            // FD can still be -1 here (startup race). Wait briefly before first TX burst.
+            if (!waitUntilSerialReady()) {
+                Timber.e("txPacketOnce skipped: serial port is not ready (fd=%d)", serialPortRepository.getFD())
+                return@launch
+            }
+
             // viewModel init 으로 이동. 필요.
             // 경고 정보 조회 (주기적 heart beat)
             // repeatOnLifecycle은 Activity가 포그라운드에 있을 때로 한정지어, 특정 Lifecycle이 Trigger 되었을 때 동작하도록 만드는 block 임.
@@ -824,14 +834,43 @@ class MainViewModel @Inject constructor(
             // tx Q-Switch Write
             txPacket(READ_WRITE.WRITE, CMD.Q_SWITCH, qSwitch.value)
 
+            // tx Oven Write (align with Engineer KTP write source)
+            txPacket(READ_WRITE.WRITE, CMD.OVEN, Oven(ktp = temperature_write.value.ktp))
+
             // tx Guide Beam Write
-        txPacket(READ_WRITE.WRITE, CMD.GUIDE_BEAM, GuideBeam(value = guideBeam.value.toInt()))
+            txPacket(READ_WRITE.WRITE, CMD.GUIDE_BEAM, GuideBeam(value = getGuideBeamTxValue()))
 
             // tx DCD_GAS Write (DEFAULT VALUE)
             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))
+        }
+    }
+
+    private suspend fun waitUntilSerialReady(
+        timeoutMillis: Long = 2000L,
+        pollIntervalMillis: Long = 20L
+    ): Boolean {
+        // Poll FD until open() completes, with a bounded timeout to avoid blocking forever.
+        val start = System.currentTimeMillis()
+        while (System.currentTimeMillis() - start < timeoutMillis) {
+            if (serialPortRepository.getFD() != -1) return true
+            delay(pollIntervalMillis)
+        }
+        return serialPortRepository.getFD() != -1
+    }
+
+    // Guide Beam step mapping (0~10)
+    // 0 -> fixed 0
+    // 1~10 -> min~max range in 10 steps (10 -> max)
+    private fun getGuideBeamTxValue(): Int {
+        val step = guideBeam.value.toInt().coerceIn(0, 10)
+        return if (step == 0) {
+            0
+        } else {
+            guideBeamMin.value + ((step - 1) * (guideBeamMax.value - guideBeamMin.value) / 9)
+        }
     }
 
     // Example: Emitting an event after a delay
@@ -1067,7 +1106,7 @@ class MainViewModel @Inject constructor(
                 CMD.LASER_STATUS -> {
                     val l = packet.data.toLaserStatus()
                     setLaserStatus(l.copy())
-                    // on receuve laser on (or interval) increase count and save to pref.
+                    // on receive laser on (or interval) increase count and save to pref.
                     // Laser On 패킷만 counting 하도록 변경 (2개 패킷 모두 수신 됨)
                     if (_laserStatus.value.laserStatus == LASER_STATUS.LASER_ON /* || l.laserStatus == LASER_STATUS.INTERVAL */) {
                         playBeepSound()
@@ -1146,58 +1185,19 @@ class MainViewModel @Inject constructor(
                     setEnergyControl(EnergyControl(0x03, 0x00))
                     setEnergyMeasured(EnergyMeasured(0x04, 0x00, 0x00))
 
-                    // hand piece 별 count 증가
+                    val connectedHandPieceLifeTime = when (h.type) {
-                    when (h.type) {
+                        1 -> lifeTime.value.hp5x5
-                        1 -> {  // hp 5x5
+                        2 -> lifeTime.value.hp7x7
-                            setLifeTime(
+                        3 -> lifeTime.value.hp10x10
-                                _lifeTime.value.copy(
+                        4 -> lifeTime.value.hp12x12
-                                    hp5x5 = _lifeTime.value.hp5x5 + 1
+                        5 -> lifeTime.value.hp3x15
-                                )
-                            )
-                            saveLifeTimeToPreference()
-                            Timber.d("_lifeTime (hp5x5): ${_lifeTime}")
-                        }
-                        2 -> {
-                            setLifeTime(
-                                _lifeTime.value.copy(
-                                    hp7x7 = _lifeTime.value.hp7x7 + 1
-                                )
-                            )
-                            saveLifeTimeToPreference()
-                            Timber.d("_lifeTime (hp7x7): ${_lifeTime}")
-                        }
-                        3 -> {
-                            setLifeTime(
-                                _lifeTime.value.copy(
-                                    hp10x10 = _lifeTime.value.hp10x10 + 1
-                                )
-                            )
-                            saveLifeTimeToPreference()
-                            Timber.d("_lifeTime (hp10x10): ${_lifeTime}")
-                        }
-                        4 -> {
-                            setLifeTime(
-                                _lifeTime.value.copy(
-                                    hp12x12 = _lifeTime.value.hp12x12 + 1
-                                )
-                            )
-                            saveLifeTimeToPreference()
-                            Timber.d("_lifeTime (hp12x12): ${_lifeTime}")
-                        }
-                        5 -> {
-                            setLifeTime(
-                                _lifeTime.value.copy(
-                                    hp3x15 = _lifeTime.value.hp3x15 + 1
-                                )
-                            )
-                            saveLifeTimeToPreference()
-                            Timber.d("_lifeTime (hp3x15): ${_lifeTime}")
-                        }
                         else -> {
-                            Timber.d("unknwon hand piece type: ${h.type}")
+                            Timber.d("Unknown Hand-piece type: ${h.type}")
                             return@launch
                         }
                     }
+                    Timber.d("HAND_PIECE lifetime: type=${h.type}, value=${connectedHandPieceLifeTime}, hpCount=${hpCount.value}")
+
 
                     // hand piece가 변경 시점 에서, pref 테이블 값을 -> energyTable 로 로딩
                     loadFluenceTable(handPiece.value.type)
@@ -2043,28 +2043,58 @@ class MainViewModel @Inject constructor(
         Timber.d("preset: ${preset}")
 
         val newPreset = if (preset == null) {
+            val defaultPulseWidth = PulseDurations.first()
             Preset(
                 handPieceType = handPiece.value.type,
                 priority = priority,
-                fluence = energyTable.value.getKey2ListForKey1(0.5f).first(),
+                fluence = energyTable.value.getKey2ListForKey1(defaultPulseWidth).firstOrNull() ?: 0f,
                 repetition = repetitionList.value.first(),
-                pulseWidth = PulseDurations.first(),
+                pulseWidth = defaultPulseWidth,
             )
         } else {
             preset
         }
+        applyPreset(newPreset)
+    }
 
-        val fluenceList = energyTable.value.getKey2ListForKey1(newPreset.pulseWidth)
+    fun applyPreset(preset: Preset) {
+        val newPreset = preset.copy()
 
         val pulseStep = PulseDurations.indexOf(newPreset.pulseWidth).takeIf {it != -1} ?: 0
-        val fluenceStep = fluenceList.indexOf(newPreset.fluence).takeIf {it != -1} ?: 0
+        val resolvedPulseWidth = PulseDurations[pulseStep]
-        val repetitionStep = repetitionList.value.indexOf(newPreset.repetition).takeIf {it != -1} ?: 0
+
+        // 프리셋의 pulseWidth 기준으로 실제 사용 가능한 fluence 목록을 먼저 동기화한다.
+        val newFluenceList = energyTable.value.getKey2ListForKey1(resolvedPulseWidth)
+        if (newFluenceList != fluenceList.value) {
+            setFluenceList(newFluenceList)
+        }
+
+        // 프리셋 fluence가 정확히 없을 수 있으므로, 가장 가까운 값으로 보정한다.
+        val resolvedFluence = newFluenceList.minByOrNull { abs(it - newPreset.fluence) }
+            ?: newFluenceList.firstOrNull()
+            ?: 0f
+        val fluenceStep = newFluenceList.indexOf(resolvedFluence).takeIf { it != -1 } ?: 0
+
+        // 보정된 (pulseWidth, fluence) 조합으로 repetition 테이블을 다시 계산한다.
+        val hzType = hzTable.value.getValue(resolvedPulseWidth, resolvedFluence)
+        val newRepetitionList = RepetitionsByColorKey[hzType] ?: RepetitionsByColorKey[KEY_YELLOW]!!
+        if (newRepetitionList != repetitionList.value) {
+            setRepetitionList(newRepetitionList)
+        }
+        val repetitionStep = newRepetitionList.indexOf(newPreset.repetition).takeIf { it != -1 } ?: 0
 
         Timber.d("pulseStep: ${pulseStep} fluenceStep: ${fluenceStep} repetitionStep: ${repetitionStep}")
 
         val pulseAngle = pulseStep.stepToDegree(totalSteps = PulseDurations.size)
-        val fluenceAngle = fluenceStep.stepToDegree(totalSteps = fluenceList.size)
+        val fluenceAngle = if (newFluenceList.isNotEmpty()) {
-        val repetitionAngle = repetitionStep.stepToDegree(totalSteps = repetitionList.value.size)
+            fluenceStep.stepToDegree(totalSteps = newFluenceList.size)
+        } else {
+            0f
+        }
+        val repetitionAngle = repetitionIndexToAngle(
+            index = repetitionStep,
+            totalSteps = newRepetitionList.size,
+        )
 
         Timber.d("pulseStep: ${pulseStep} fluenceStep: ${fluenceStep} repetitionStep: ${repetitionStep}")
 
@@ -2094,30 +2124,35 @@ class MainViewModel @Inject constructor(
             setFluenceList(newFluenceList)
         }
 
+        // 2-1. Resolve and apply fluence by value (not by old angle/index).
+        val resolvedFluence = newFluenceList.minByOrNull { abs(it - newFluence) } ?: 0f
+        val resolvedFluenceIndex = newFluenceList.indexOf(resolvedFluence).takeIf { it >= 0 } ?: 0
+        if (newFluenceList.isNotEmpty()) {
+            setFluenceAngle(resolvedFluenceIndex.stepToDegree(totalSteps = newFluenceList.size))
+        }
+
         // 3. Safely Update Repetition List (Prevents NullPointerException)
-        val newHzType = hzTable.value.getValue(newPulseDuration, newFluence)
+        val newHzType = hzTable.value.getValue(newPulseDuration, resolvedFluence)
         val newRepetitionList = RepetitionsByColorKey[newHzType] ?: RepetitionsByColorKey[KEY_YELLOW]!!
         if (newRepetitionList != repetitionList.value) {
             setRepetitionList(newRepetitionList)
         }
 
-        // Smartly preserve Repetition Angle
+        // 4. Resolve and apply repetition by value (not by old angle/index).
-        // 4. Check if the old repetition value exists in the new list.
+        val targetRepetition = currentRepetitionValue ?: 0f
-        val oldRepetitionIndex = if (currentRepetitionValue != null) {
+        val resolvedRepetition = newRepetitionList.minByOrNull { abs(it - targetRepetition) } ?: 0f
-            newRepetitionList.indexOf(currentRepetitionValue)
+        val resolvedRepetitionIndex = newRepetitionList.indexOf(resolvedRepetition).takeIf { it >= 0 } ?: 0
-        } else {
-            -1
-        }
 
-        if (oldRepetitionIndex != -1) {
+        if (newRepetitionList.isNotEmpty()) {
-            // If the old value exists, set the slider to that position.
+            val resolvedRepetitionAngle = repetitionIndexToAngle(
-            val preservedAngle = oldRepetitionIndex.stepToDegree(totalSteps = newRepetitionList.size)
+                index = resolvedRepetitionIndex,
-            setRepetitionAngle(preservedAngle)
+                totalSteps = newRepetitionList.size,
-            Timber.d("Repetition value $currentRepetitionValue preserved at new angle $preservedAngle.")
+            )
+            setRepetitionAngle(resolvedRepetitionAngle)
+            Timber.d("Resolved repetition by value: old=$currentRepetitionValue, new=$resolvedRepetition, angle=$resolvedRepetitionAngle")
         } else {
-            // If it doesn't exist, THEN reset the slider to the beginning.
             setRepetitionAngle(0f)
-            Timber.d("Repetition value $currentRepetitionValue not supported in new list. Resetting angle.")
+            Timber.d("Repetition list is empty. Resetting repetition angle to 0f.")
         }
 
         // 5. Conditionally reset the fluence angle slider if needed
@@ -2130,7 +2165,7 @@ class MainViewModel @Inject constructor(
         // 6. Any change invalidates the current preset selection.
         setSelectedPresetIndex(0)
 
-        Timber.d("Updated Laser Parameters: pulse=$newPulseDuration, fluence=$newFluence -> newRepListSize=${newRepetitionList.size}")
+        Timber.d("Updated Laser Parameters: pulse=$newPulseDuration, fluence=$resolvedFluence -> newRepListSize=${newRepetitionList.size}")
     }
 
     /**
@@ -2150,13 +2185,16 @@ class MainViewModel @Inject constructor(
         setPulseAngle(newPulseStep.stepToDegree(totalSteps = PulseDurations.size))
 
         val newPulseDuration = PulseDurations[newPulseStep]
-        // When pulse duration changes via slider, we use the first available fluence for the new list.
+        // Keep the current fluence value when pulse duration changes via slider.
-        val firstFluence = energyTable.value.getKey2ListForKey1(newPulseDuration).firstOrNull() ?: 0f
+        val currentFluenceStep = fluenceAngle.value.degreeToStep(totalSteps = fluenceList.value.size)
+        val currentFluence = fluenceList.value.getOrNull(currentFluenceStep)
+            ?: energyTable.value.getKey2ListForKey1(newPulseDuration).firstOrNull()
+            ?: 0f
 
-        // Call the centralized helper, resetting the fluence slider.
+        // Call the centralized helper using the preserved fluence value.
         updateLaserParameters(
             newPulseDuration = newPulseDuration,
-            newFluence = firstFluence,
+            newFluence = currentFluence,
         )
     }
 
@@ -2168,12 +2206,17 @@ class MainViewModel @Inject constructor(
             setPulseAngle(newStep.stepToDegree(totalSteps = PulseDurations.size))
 
             val newPulseDuration = PulseDurations[newStep]
-            val firstFluence = energyTable.value.getKey2ListForKey1(newPulseDuration).firstOrNull() ?: 0f
+            // Keep the current fluence value when pulse duration changes via slider.
+            val currentFluenceStep = fluenceAngle.value.degreeToStep(totalSteps = fluenceList.value.size)
+            val currentFluence = fluenceList.value.getOrNull(currentFluenceStep)
+                ?: energyTable.value.getKey2ListForKey1(newPulseDuration).firstOrNull()
+                ?: 0f
+
 
             // Call the centralized helper, resetting the fluence slider.
             updateLaserParameters(
                 newPulseDuration = newPulseDuration,
-                newFluence = firstFluence,
+                newFluence = currentFluence,
             )
         }
     }
@@ -2216,8 +2259,12 @@ class MainViewModel @Inject constructor(
 
     fun onChangeRepetition(angle: Float) {
         // This logic is simple and has no complex dependencies, so it can remain as is.
-        if (angle != repetitionAngle.value) {
+        val normalizedAngle = repetitionIndexToAngle(
-            setRepetitionAngle(angle)
+            index = angle.degreeToStep(totalSteps = repetitionList.value.size),
+            totalSteps = repetitionList.value.size,
+        )
+        if (normalizedAngle != repetitionAngle.value) {
+            setRepetitionAngle(normalizedAngle)
         }
         setSelectedPresetIndex(0)
     }
@@ -2228,12 +2275,23 @@ class MainViewModel @Inject constructor(
         val newStep = if (state == UpDownState.Up) currentStep + 1 else currentStep - 1
 
         if (newStep in repetitionList.value.indices) {
-            val newRepetitionAngle = newStep.stepToDegree(totalSteps = repetitionList.value.size)
+            val newRepetitionAngle = repetitionIndexToAngle(
+                index = newStep,
+                totalSteps = repetitionList.value.size,
+            )
             setRepetitionAngle(newRepetitionAngle)
             setSelectedPresetIndex(0)
         }
     }
 
+    private fun repetitionIndexToAngle(index: Int, totalSteps: Int): Float {
+        return when {
+            totalSteps <= 0 -> 0f
+            totalSteps == 1 -> 270f
+            else -> index.stepToDegree(totalSteps = totalSteps)
+        }
+    }
+
     /**
      * Perform all heavy I/O in a single background block.
      * This prevents the "Skipped frames" caused by 30+ sequential bridge calls

app/src/main/java/com/laseroptek/raman/utils/ext/PacketExtension.kt

@@ -487,7 +487,7 @@ fun QSwitch.toByteArray(): ByteArray {
     val delayTimeIntegerPart = this.delayTime.toInt()
     val delayTimeFractionPart = ((this.delayTime - delayTimeIntegerPart) * 10).toInt()
     val intervalTimeIntegerPart = this.intervalTime.toInt()
-    val intervalTimeFractionPart = ((this.intervalTime - delayTimeIntegerPart) * 10).toInt()
+    val intervalTimeFractionPart = ((this.intervalTime - intervalTimeIntegerPart) * 10).toInt()
 
     val delayTimeArray = byteArrayOf(
         ((delayTimeIntegerPart.getNthDigit(2) + 0x30) and 0xFF).toByte(),

docs/change_summary_2026-03-04.md

@@ -0,0 +1,23 @@
+# 변경 요약 (2026-03-04)
+
+이 문서는 현재 `git diff` 기준으로 반영된 변경을 정리합니다.
+
+## 1) 시리얼 초기 전송 누락(Startup race) 대응
+
+### 변경 파일
+- `app/src/main/java/com/laseroptek/raman/ui/MainActivity.kt`
+- `app/src/main/java/com/laseroptek/raman/ui/screens/main/MainViewModel.kt`
+
+### 변경 내용
+- `MainActivity.initialize()`의 시리얼 시작 순서를 조정
+  - 이전: `txPacketOnce()` -> `rxPacketLoop()` -> `txPacketLoop()`
+  - 이후: `rxPacketLoop()` -> `txPacketOnce()` -> `txPacketLoop()`
+- `MainViewModel.txPacketOnce()`를 코루틴(IO)에서 실행하도록 변경
+- `waitUntilSerialReady()` 추가
+  - 최대 2초 동안 20ms 간격으로 `FD != -1` 확인
+  - 준비 실패 시 에러 로그 후 초기 TX 중단
+- 관련 설명 주석 추가
+
+### 의도/효과
+- 앱 시작 직후 `open()` 완료 전 TX가 먼저 발생하는 레이스를 완화/방어
+- 포트 미준비 상태(`FD == -1`)에서 write가 호출되어 초기 패킷이 누락되는 문제를 줄임

docs/serial_tx_startup_race.md

@@ -0,0 +1,41 @@
+# Serial TX Startup Race 정리
+
+## 1) FD(File Descriptor)란?
+- `FD`는 리눅스/안드로이드에서 열린 리소스(파일/소켓/시리얼 포트)를 가리키는 정수 핸들입니다.
+- 이 프로젝트에서 시리얼 포트 상태는 다음처럼 판단합니다.
+  - `FD == -1`: 포트 미오픈(유효하지 않음)
+  - `FD >= 0`: 포트 오픈 완료(유효)
+- 따라서 `FD == -1` 상태에서 `write()`를 호출하면 실제 시리얼 전송이 되지 않습니다.
+
+## 2) 문제 원인
+- `txPacketOnce()`가 앱 시작 직후 실행됩니다.
+- 시리얼 포트 `open()`은 `rxPacketLoop()` 내부에서 코루틴으로 비동기 시작됩니다.
+- 기존 순서에서 `txPacketOnce()`가 먼저 호출되면, 포트 오픈 완료 전(`FD == -1`)에 TX가 시도되어 초기 패킷 전송이 누락될 수 있습니다.
+
+## 3) 적용한 수정
+
+### A. 초기 호출 순서 조정
+- 파일: `app/src/main/java/com/laseroptek/raman/ui/MainActivity.kt`
+- 변경:
+  - 이전: `txPacketOnce()` -> `rxPacketLoop()` -> `txPacketLoop()`
+  - 이후: `rxPacketLoop()` -> `txPacketOnce()` -> `txPacketLoop()`
+- 목적: RX 루프가 먼저 포트 오픈을 시작하도록 해서 초기 TX 레이스 확률을 줄임
+
+### B. `txPacketOnce()`에 포트 준비 대기 추가
+- 파일: `app/src/main/java/com/laseroptek/raman/ui/screens/main/MainViewModel.kt`
+- 변경:
+  - `txPacketOnce()`를 IO 코루틴에서 실행
+  - `waitUntilSerialReady()`(최대 2초, 20ms 폴링)로 `FD != -1` 확인 후 TX 진행
+  - 시간 내 준비 실패 시 로그를 남기고 전송 중단
+- 목적: 순서만으로 보장되지 않는 코루틴 스케줄링 레이스를 방어
+
+## 4) 왜 TX에서 직접 open()하지 않았는가?
+- 현재 구조에서 `open()`의 데이터 콜백은 `rxPacketLoop()`의 `callbackFlow`와 연결됩니다.
+- TX 경로에서 별도 `open()`을 하면 중복 오픈/콜백 소유권/FD 교체 타이밍 이슈가 생길 수 있습니다.
+- 안정적인 패턴은:
+  - 포트 오픈 책임: RX(단일 지점)
+  - 포트 사용(TX): ready 확인 후 write
+
+## 5) 확인 포인트
+- 앱 시작 직후 로그에서 `FD`가 유효해진 뒤 `txPacketOnce()`의 TX 로그가 출력되는지 확인
+- 장비 측 시리얼 모니터에서 초기 패킷(Version/Q-Switch/GuideBeam/DCD/SprayDCD) 수신 여부 확인