feat: #72 Read/Write 표시 위치 수정 미적용

README.md

@@ -214,10 +214,3 @@
   - `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_GREEN,
+    Pair(0.5f, 0.5f) to KEY_BLUE,
     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_BLUE,
+    Pair(0.5f,4.0f) to KEY_YELLOW,
     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_GRAY,
+    Pair(3f, 1.1f) to KEY_RED,
     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 = 08.0f
+const val DEFAULT_DCD_GAS_PRESSURE = 06.5f
 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).map{ it.toString() }
+val dcdDelayValues = listOf(10, 20, 30, 40, 50, 60, 70, 80, 90, 100).map{ it.toString() }
 
 // default spray dcd list for options
 val SprayDcdList = listOf<SprayDcd>(
-    SprayDcd(status = 0x41, sprayTime = 10, sprayDelay = 10), // default
+    SprayDcd(status = 0x44, sprayTime = 10, sprayDelay = 10), // default
-    SprayDcd(status = 0x41, sprayTime = 10, sprayDelay = 10),
+    SprayDcd(status = 0x44, sprayTime = 10, sprayDelay = 10),
-    SprayDcd(status = 0x41, sprayTime = 20, sprayDelay = 10),
+    SprayDcd(status = 0x44, sprayTime = 20, sprayDelay = 20),
-    SprayDcd(status = 0x41, sprayTime = 30, sprayDelay = 20),
+    SprayDcd(status = 0x44, sprayTime = 30, sprayDelay = 20),
-    SprayDcd(status = 0x41, sprayTime = 40, sprayDelay = 20),
+    SprayDcd(status = 0x44, sprayTime = 40, sprayDelay = 40),
-    SprayDcd(status = 0x41, sprayTime = 50, sprayDelay = 30),
+    SprayDcd(status = 0x44, sprayTime = 50, sprayDelay = 50),
-    SprayDcd(status = 0x41, sprayTime = 60, sprayDelay = 30),
+    SprayDcd(status = 0x44, sprayTime = 60, sprayDelay = 60),
 )
 
 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 = 0x50,     // 1Byte(A(0x41): on, D(0x44): off, P(0x50): pressure)
+    val status: Int = 0x41,     // 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 = 0  // ascii (00 ~ 99)
+    val type:Int = 1  // ascii (00 ~ 99)
 )

app/src/main/java/com/laseroptek/raman/data/source/preference/Preference.kt

@@ -88,7 +88,4 @@ interface Preference {
     suspend fun getPowerSupplySerialListFromPreference(): Flow<List<String>>
     /////
 
-    suspend fun saveInfoChartLineStates(states: Map<String, Boolean>)
+}
-    suspend fun getInfoChartLineStates(): Flow<Map<String, Boolean>>
-
-}

app/src/main/java/com/laseroptek/raman/repository/PreferenceRepository.kt

@@ -68,9 +68,6 @@ class PreferenceRepository(private val context: Context) : Preference {
         val PRODUCT_SERIAL = stringPreferencesKey("PRODUCT_SERIAL")
         val LASER_HAND_SERIAL = stringPreferencesKey("LASER_HAND_SERIAL")
         val POWER_SUPPLY_SERIAL = stringPreferencesKey("POWER_SUPPLY_SERIAL")
-
-        // InfoScreen Chart Checkboxes
-        val INFO_CHART_LINE_STATES = stringPreferencesKey("INFO_CHART_LINE_STATES")
     }
 
     override suspend fun clearAllPreferences() {
@@ -562,31 +559,4 @@ class PreferenceRepository(private val context: Context) : Preference {
             emit(listOf("B", "U", "O", "C", "L", "D"))
         }
     }
-
+}
-    override suspend fun saveInfoChartLineStates(states: Map<String, Boolean>) {
-        try {
-            val stateJson = gson.toJson(states)
-            context.datastore.edit { preferences ->
-                preferences[INFO_CHART_LINE_STATES] = stateJson
-            }
-        } catch (e: Exception) {
-            Timber.e(e, "Failed to serialize INFO_CHART_LINE_STATES to JSON.")
-        }
-    }
-
-    override suspend fun getInfoChartLineStates(): Flow<Map<String, Boolean>> {
-        return context.datastore.data.map { preferences ->
-            preferences[INFO_CHART_LINE_STATES]
-        }.distinctUntilChanged().map { jsonString ->
-            if (!jsonString.isNullOrBlank()) {
-                val type = object : TypeToken<Map<String, Boolean>>() {}.type
-                gson.fromJson<Map<String, Boolean>>(jsonString, type) ?: emptyMap()
-            } else {
-                emptyMap()
-            }
-        }.catch { e ->
-            Timber.e(e, "Failed to get or parse INFO_CHART_LINE_STATES. Emitting default.")
-            emit(emptyMap())
-        }
-    }
-}

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

@@ -260,11 +260,9 @@ class MainActivity : ComponentActivity() {
                     // This prevents serial interrupts from stealing CPU during the first frame.
                     delay(200)
 
-                    // 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.rxPacketLoop()
                     vm.txPacketLoop()
 
                     Timber.d("System fully operational.")

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

@@ -439,15 +439,15 @@ fun ConfigScreen(
                                     mainViewModel.saveGuideBeamToPreference()
                                 }
 
-                                // Guide Beam step mapping (0~10):
+                                /*
-                                // 0 -> fixed 0
+                                val value = when(guideBeam.toInt()) {
-                                // 1~10 -> min~max range in 10 steps (10 -> max)
+                                    0 -> 0
-                                val step = guideBeam.toInt().coerceIn(0, 10)
+                                    1 -> guideBeamMin
-                                val value = if (step == 0) {
+                                    10 -> guideBeamMax
-                                    0
+                                    else -> (guideBeamMin + (guideBeam.toInt() - 1) * ((guideBeamMax - guideBeamMin) / 9))
-                                } else {
-                                    guideBeamMin + ((step-1) * (guideBeamMax - guideBeamMin) / 9)
                                 }
+                                */
+                                val value = (guideBeamMin + (guideBeam.toInt() - 1) * ((guideBeamMax - guideBeamMin) / 9))
 
                                 Timber.d("guideBeam: $value, guideBeamMax: $guideBeamMax, guideBeamMin: $guideBeamMin")
                                 mainViewModel.txPacket(READ_WRITE.WRITE, CMD.GUIDE_BEAM, GuideBeam(value = value))
@@ -854,4 +854,4 @@ fun PreviewConfigScreen(
         mainViewModel = mainViewModel,
         configViewModel = configViewModel
     )
-}
+}

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

@@ -31,7 +31,7 @@ fun HourItemView(
     modifier: Modifier = Modifier,
     hour: Int = 0,
     onClick: () -> Unit = {},
-    title: String = ""
+    title:String = ""
 ) {
     Row(modifier = modifier,
         horizontalArrangement = Arrangement.SpaceBetween,
@@ -129,4 +129,4 @@ fun PreviewHourItemView() {
             title = "Hour Item View"
         )
     }
-}
+}

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

@@ -32,11 +32,11 @@ fun LifeTimeView(
 ) {
     Column(modifier = Modifier
         //.noRippleClickable(onClick = onClick)
-        .size(388.px.dp, 258.px.dp)
+        .size(388.px.dp, 276.px.dp)
         .clip(RoundedCornerShape(12.px.dp))
         .border(width = 1.px.dp, color = Color(209, 209, 209), shape = RoundedCornerShape(10.px.dp))
         .background(Color.White)
-        .padding(3.px.dp, 16.px.dp),
+        .padding(16.px.dp),
         verticalArrangement = Arrangement.SpaceEvenly,
         horizontalAlignment = Alignment.CenterHorizontally
     ) {
@@ -55,11 +55,11 @@ fun LifeTimeView(
                 ),
         )
 
-        Spacer(modifier = Modifier.height(2.px.dp))
+        Spacer(modifier = Modifier.height(10.px.dp))
 
         // Temp 0..7
-        for (i in 0..lifeTimeTypes.size - 1) {
+        for (i in 0..lifeTimeTypes.size -1) {
-            val value = when (i) {
+            val hour = when (i) {
                 0 -> lifeTime.lamp
                 1 -> lifeTime.hp5x5
                 2 -> lifeTime.hp7x7
@@ -70,35 +70,22 @@ fun LifeTimeView(
                 7 -> lifeTime.water
                 else -> 0
             }
-            val modifier = Modifier
+            HourItemView(
-                .fillMaxSize()
+                modifier = Modifier
-                .weight(1f)
+                    .fillMaxSize()
-                .padding(
+                    .weight(1f)
-                    start = 20.px.dp,
+                    .padding(
-                    end = 20.px.dp,
+                        start = 20.px.dp,
-                    //bottom = 10.px.dp
+                        end = 20.px.dp,
-                )
+                        //bottom = 10.px.dp
-            val title = lifeTimeTypes[i]
+                    ),
-            val onItemClick = {
+                title = lifeTimeTypes[i],
-                Timber.d("onClick > Temp $i ($title)")
+                hour = hour,
-                onClick.invoke(i)
+                onClick = {
-            }
+                    Timber.d("onClick > Temp $i (${lifeTimeTypes[i]})")
-
+                    onClick.invoke(i)
-            if (i <= 5) {
+                }
-                CountItemView(
+            )
-                    modifier = modifier,
-                    title = title,
-                    count = value,
-                    onClick = onItemClick
-                )
-            } else {
-                HourItemView(
-                    modifier = modifier,
-                    title = title,
-                    hour = value,
-                    onClick = onItemClick
-                )
-            }
 
             if (i < lifeTimeTypes.size -1) {
                 HorizontalDivider(
@@ -121,4 +108,4 @@ fun LifeTimeView(
 @Composable
 fun PreviewLifeTimeView() {
     LifeTimeView()
-}
+}

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

@@ -42,7 +42,7 @@ fun TemperatureView(
         .clip(RoundedCornerShape(12.px.dp))
         .border(width = 1.px.dp, color = Color(209, 209, 209), shape = RoundedCornerShape(10.px.dp))
         .background(Color.White)
-        .padding(3.px.dp, 16.px.dp),
+        .padding(16.px.dp),
         verticalArrangement = Arrangement.SpaceEvenly,
         horizontalAlignment = Alignment.CenterHorizontally
     ) {
@@ -61,6 +61,8 @@ fun TemperatureView(
                 ),
         )
 
+        Spacer(modifier = Modifier.height(10.px.dp))
+
         Row(
             modifier = Modifier
                 .fillMaxWidth()
@@ -87,8 +89,6 @@ fun TemperatureView(
             Spacer(modifier = Modifier.weight(1f))
         }
 
-        Spacer(modifier = Modifier.height(2.px.dp))
-
         // Tempearture
         for (i in 0..temperatureTypes.size -1) {
             val count1Value = when (i) {

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

@@ -35,7 +35,6 @@ import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
 import androidx.hilt.lifecycle.viewmodel.compose.hiltViewModel
 import com.laseroptek.raman.const.LaserParameter
-import com.laseroptek.raman.const.LASER_STATUS
 import com.laseroptek.raman.const.LaserStatusType
 import com.laseroptek.raman.const.MAX_LASER_COUNT
 import com.laseroptek.raman.const.PresetButtonType
@@ -93,18 +92,10 @@ fun HomeScreen(
 
     val presetList by mainViewModel.presetList.collectAsState()
 
-    LaunchedEffect(lampCount, lifeTime.lamp, laserStatus.laserStatus) {
+    LaunchedEffect(Unit) {
         Timber.d("LaunchedEffect - HomeScreen")
         focusManager.clearFocus(force = true) // Hide the keyboard
 
-        // Ensure the system returns to StandBy when lamp thresholds are exceeded
-        val lampLifetimeLimit = lifeTime.lamp
-        val reachedLifetimeLimit = lampLifetimeLimit > 0 && lampCount >= lampLifetimeLimit
-        if (reachedLifetimeLimit && laserStatus.laserStatus != LASER_STATUS.STAND_BY) {
-            Timber.d("HomeScreen load - forcing StandBy state due to lamp count limit")
-            mainViewModel.txLaserStatusEntry(LASER_STATUS.STAND_BY)
-        }
-
         Timber.d("Attempted to hide keyboard on EngineerScreen launch")
     }
 
@@ -304,7 +295,7 @@ fun HomeScreen(
                     pulseType = pulseType,
                     handPieceType = handPiece.type,
                     type = LaserStatusType.REPETITION,
-                    angle = if (pulseType == 0 || repetitionList.isEmpty()) 0f else repetitionAngle,
+                    angle = if (pulseType == 0 || repetitionList.size < 2) 0f else repetitionAngle,
                     onChange = { angle ->
                         if (handPiece.type == 0) {
                             Toast.makeText(
@@ -315,7 +306,7 @@ fun HomeScreen(
                             return@LaserControlView
                         }
 
-                        if (pulseType == 0 || repetitionList.isEmpty()) {
+                        if (pulseType == 0 || repetitionList.size < 2) {
                             //Toast.makeText(context, "Single pulse type (0 Hz)", Toast.LENGTH_SHORT).show()
                         } else {
                             mainViewModel.onChangeRepetition(angle)
@@ -332,7 +323,7 @@ fun HomeScreen(
                             return@LaserControlView
                         }
 
-                        if (pulseType == 0 || repetitionList.isEmpty()) {
+                        if (pulseType == 0 || repetitionList.size < 2) {
                             //Toast.makeText(context, "Single pulse type (0 Hz)", Toast.LENGTH_SHORT).show()
                         } else {
                             //mainViewModel.onClickRepetition(state)
@@ -491,18 +482,6 @@ fun HomeScreen(
                             return@StandByButton
                         }
 
-                        val lampLifetimeLimit = lifeTime.lamp
-                        if (lampLifetimeLimit > 0 && lampCount >= lampLifetimeLimit) {
-                            Toast.makeText(
-                                context,
-                                "Lamp lifetime limit reached",
-                                Toast.LENGTH_SHORT
-                            ).show()
-                            return@StandByButton
-                        }
-
-
-
                         val hpCount = mainViewModel.getHPCount()
                         if (hpCount < 1) {
                             Toast.makeText(

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

@@ -256,11 +256,7 @@ fun DcdSettingPopup(
                                     mainViewModel.setSelectedSprayDcdIndex(i)
                                     val optionValue  = mainViewModel.sprayDcdList[i]
                                     mainViewModel.setSprayDcd(optionValue)
-                                    mainViewModel.txPacket(
+                                    mainViewModel.txPacket(READ_WRITE.WRITE, CMD.SPRAY_DCD, optionValue)
-                                        READ_WRITE.WRITE,
-                                        CMD.SPRAY_DCD,
-                                        optionValue.copy(status = 0x41)
-                                    )
 
                                     scope.launch {
                                         mainViewModel.saveSprayDcdIndexToPreference()
@@ -307,11 +303,7 @@ fun DcdSettingPopup(
                                     mainViewModel.setSelectedSprayDcdIndex(i)
                                     val optionValue  = mainViewModel.sprayDcdList[i]
                                     mainViewModel.setSprayDcd(optionValue)
-                                    mainViewModel.txPacket(
+                                    mainViewModel.txPacket(READ_WRITE.WRITE, CMD.SPRAY_DCD, optionValue)
-                                        READ_WRITE.WRITE,
-                                        CMD.SPRAY_DCD,
-                                        optionValue.copy(status = 0x41)
-                                    )
 
                                     scope.launch {
                                         mainViewModel.saveSprayDcdToPreference()
@@ -342,7 +334,7 @@ fun DcdSettingPopup(
                         modifier = Modifier
                             .fillMaxHeight()
                             .size(40.px.dp, 210.px.dp),
-                        chargeRate = gasChargeRate
+                        chargeRate = gasChargeRate.toInt()
                     )
 
                     // Icon
@@ -611,12 +603,6 @@ 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(55.px.dp)
+                    .width(45.px.dp)
                     .fillMaxHeight()
                 , horizontalAlignment = Alignment.CenterHorizontally
                 , verticalArrangement = Arrangement.Center
@@ -120,7 +120,7 @@ fun DcdView(
                 )
             }
 
-            Spacer( Modifier.width(5.px.dp))
+            Spacer( Modifier.width(10.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(5.px.dp))
+            Spacer( Modifier.width(10.px.dp))
 
             // Delay
             Timber.d("selectedSprayDcdIndex.value: ${selectedSprayDcdIndex}")

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

@@ -28,26 +28,14 @@ import com.laseroptek.raman.ui.screens.main.MainViewModel
 import com.laseroptek.raman.utils.DefaultDispatcherProvider
 import com.laseroptek.raman.utils.ext.px
 import timber.log.Timber
-import kotlin.math.abs
-import kotlin.math.ceil
 
 
 @Composable
 fun GradientSlider(
     modifier: Modifier = Modifier,
-    chargeRate: Float = 0f,
+    chargeRate: Int = 0, // Value from (0 .. 100)
 ) {
-    val normalizedRate = chargeRate.coerceIn(0f, 100f)
+    val chargeIndex = ((chargeRate.coerceIn(0, 100) + 4) / 5).toInt()   // 0..19
-    val bucket = normalizedRate / 5f
-    val remainder = normalizedRate % 5f
-    val isExactMultiple = abs(remainder) < 0.0001f
-
-    val chargeIndex = when {
-        normalizedRate == 0f -> -1
-        isExactMultiple -> (bucket - 1f).toInt().coerceAtLeast(-1)
-        else -> (ceil(bucket.toDouble()).toInt() - 1)
-    }.coerceIn(-1, 19)
-
     Timber.d("chargeRate: $chargeRate, chargeIndex: $chargeIndex")
 
     Box(
@@ -115,6 +103,6 @@ fun GradientSliderPreview(
         //mainViewModel = mainViewModel
         modifier = Modifier
             .size(40.px.dp, 210.px.dp),
-        chargeRate = 20f
+        chargeRate =  20
     )
 }

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

@@ -108,15 +108,15 @@ fun PresetIconButton(
         Image(
             painter = painterResource(id =
                 if (type == PresetButtonType.SAVE) {
-                    R.drawable.ic_preset_save2
+                    R.drawable.ic_preset_save
                 } else {
                     R.drawable.ic_preset_load
                 }
             ),
             contentDescription = "",
             modifier = Modifier
-                .size(30.px.dp),
+                .size(20.px.dp),
-            contentScale = ContentScale.Fit
+            contentScale = ContentScale.Crop
         )
     }
 }

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

@@ -552,12 +552,12 @@ fun PresetLoadPopup(
                     horizontalArrangement = Arrangement.Center,
                     verticalAlignment = Alignment.CenterVertically
                 ) {
+                    Spacer(Modifier.weight(1f))
+
                     if (isEditMode) {
                         ////////////////////////////////////////////////////
                         // Edit Mode
 
-                        Spacer(modifier = Modifier.width(10.px.dp))
-
                         // Preset Delete (Delete confirm popup)
                         Box(
                             modifier = Modifier
@@ -578,7 +578,7 @@ fun PresetLoadPopup(
                             )
                         }
 
-                        Spacer(Modifier.weight(1f))
+                        Spacer(Modifier.width(10.px.dp))
 
                         // Preset Cancel (Reload selected item from mainViewModel)
                         Box(
@@ -646,7 +646,7 @@ fun PresetLoadPopup(
                                     Timber.d("onClick - Confirm Save")
 
                                     // Check empty names and conflict priority exist in the preset viewmodel's presetList
-                                    var listToValidate = presetViewModel.presetList.value
+                                    val listToValidate = presetViewModel.presetList.value
 
                                     // Check for any presets with an empty name
                                     val hasEmptyName =
@@ -678,32 +678,18 @@ fun PresetLoadPopup(
                                     }
 
                                     // Check for duplicate priorities (ignoring priority 0)
-                                    val duplicatePriorityGroups = listToValidate
+                                    val priorityConflicts = listToValidate
-                                        .filter { it.priority > 0 }
+                                        .filter { it.priority > 0 } // Only consider prioritized items
-                                        .groupBy { it.priority }
+                                        .groupBy { it.priority }   // Group them by priority
-                                        .filter { it.value.size > 1 }
+                                        .any { it.value.size > 1 } // Check if any group is larger than 1
 
-                                    if (duplicatePriorityGroups.isNotEmpty()) {
+                                    if (priorityConflicts) {
-                                        val resolvedList = listToValidate.map { it.copy() }.toMutableList()
+                                        Toast.makeText(
-                                        val selectedPreset = resolvedList.getOrNull(selectedPresetIndex)
+                                            context,
-
+                                            "There are duplicate priorities. Please ensure each priority is unique.",
-                                        duplicatePriorityGroups.forEach { (priorityValue, presets) ->
+                                            Toast.LENGTH_LONG
-                                            val keeperId = presets
+                                        ).show()
-                                                .firstOrNull { preset ->
+                                        return@noRippleClickable // Stop the process
-                                                    selectedPreset != null && preset.id == selectedPreset.id
-                                                }
-                                                ?.id
-                                                ?: presets.first().id
-
-                                            resolvedList.forEachIndexed { index, preset ->
-                                                if (preset.priority == priorityValue && preset.id != keeperId) {
-                                                    resolvedList[index] = preset.copy(priority = 0)
-                                                }
-                                            }
-                                        }
-
-                                        presetViewModel.setPresetList(resolvedList)
-                                        listToValidate = resolvedList
                                     }
 
                                     Timber.d("Validation successful. Saving list to MainViewModel.")
@@ -743,11 +729,7 @@ fun PresetLoadPopup(
                                 contentScale = ContentScale.Crop
                             )
                         }
-
-                        Spacer(modifier = Modifier.width(10.px.dp))
                     } else {
-                        Spacer(Modifier.weight(1f))
-
                         ////////////////////////////////////////////////////
                         // Select Mode - hide Keyboard
                         focusManager.clearFocus(force = true) // Hide the keyboard
@@ -780,25 +762,21 @@ fun PresetLoadPopup(
                                 .noRippleClickable(onClick = {
                                     Timber.d("onClick - Preset Load")
 
-                                    val selectedPreset = presetViewModel.getPreset(selectedPresetIndex)
+                                    val selectedPreset =
-                                    if (selectedPreset == null) {
+                                        presetViewModel.getPreset(selectedPresetIndex)
-                                        Timber.w("onClick - Preset Load: selectedPreset is null. index=$selectedPresetIndex")
+                                    val priority =
-                                        return@noRippleClickable
+                                        selectedPreset?.priority ?: 0
-                                    }
-                                    val priority = selectedPreset.priority
 
                                     Timber.d("onClick - Preset Load ($priority)")
 
-                                    if (priority > 0) {
+//                                    if (priority > 0) {   // TODO : 검증 필요
                                         mainViewModel.setSelectedPresetIndex( priority )
                                         mainViewModel.applyPreset(priority)
-                                    } else {
+                                        presetViewModel.clearPreset()
-                                        // 우선순위가 NONE인 경우, 인덱스 설정 X
+                                        onClick.invoke(false)
-                                        mainViewModel.setSelectedPresetIndex(0)
+//                                    } else {
-                                        mainViewModel.applyPreset(selectedPreset)
+//                                        Timber.d("SKIP - Preset Load ($priority)")
-                                    }
+//                                    }
-                                    presetViewModel.clearPreset()
-                                    onClick.invoke(false)
                                 })
                                 .size(40.px.dp)
                                 .background(Color.Transparent)
@@ -812,8 +790,6 @@ fun PresetLoadPopup(
                                 contentScale = ContentScale.Crop
                             )
                         }
-
-                        Spacer(modifier = Modifier.width(10.px.dp))
                     }
                 }
 

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

@@ -1,14 +1,10 @@
 package com.laseroptek.raman.ui.screens.info
 
 import androidx.lifecycle.ViewModel
-import androidx.lifecycle.viewModelScope
 import dagger.hilt.android.lifecycle.HiltViewModel
-import com.laseroptek.raman.repository.PreferenceRepository
 import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.asStateFlow
 import kotlinx.coroutines.flow.update
-import kotlinx.coroutines.flow.collectLatest
-import kotlinx.coroutines.launch
 import timber.log.Timber
 import javax.inject.Inject
 
@@ -29,13 +25,10 @@ data class ChartUiState(
     val chamber2State: Boolean = true,
     val basePlateState: Boolean = true,
     val waterState: Boolean = true,
-) {
+)
-    companion object
-}
 
 @HiltViewModel
 class InfoViewModel @Inject constructor(
-    private val preferenceRepository: PreferenceRepository,
 ) : ViewModel() {
 
     // This is the single source of truth for the checkbox states.
@@ -46,7 +39,7 @@ class InfoViewModel @Inject constructor(
     fun toggleLine(line: ChartLine) {
         // .update is a thread-safe way to update the state.
         _chartUiState.update { currentState ->
-            val updatedState = when (line) {
+            when (line) {
                 ChartLine.INT_TEMP -> currentState.copy(intTempState = !currentState.intTempState)
                 ChartLine.EXT_TEMP -> currentState.copy(extTempState = !currentState.extTempState)
                 ChartLine.INT_HUMIDITY -> currentState.copy(intHumidityState = !currentState.intHumidityState)
@@ -57,51 +50,10 @@ class InfoViewModel @Inject constructor(
                 ChartLine.BASE_PLATE -> currentState.copy(basePlateState = !currentState.basePlateState)
                 ChartLine.WATER -> currentState.copy(waterState = !currentState.waterState)
             }
-            persistChartUiState(updatedState)
-            updatedState
         }
     }
 
     init {
         Timber.d("InfoViewModel init")
-        viewModelScope.launch {
-            preferenceRepository.getInfoChartLineStates().collectLatest { savedStates ->
-                if (savedStates.isEmpty()) return@collectLatest
-                _chartUiState.update { ChartUiState.fromPreference(savedStates) }
-            }
-        }
     }
-
+}
-    private fun persistChartUiState(state: ChartUiState) {
-        viewModelScope.launch {
-            preferenceRepository.saveInfoChartLineStates(state.toPreferenceMap())
-        }
-    }
-}
-
-private fun ChartUiState.toPreferenceMap(): Map<String, Boolean> = mapOf(
-    ChartLine.INT_TEMP.name to intTempState,
-    ChartLine.EXT_TEMP.name to extTempState,
-    ChartLine.INT_HUMIDITY.name to intHumidityState,
-    ChartLine.EXT_HUMIDITY.name to extHumidityState,
-    ChartLine.KTP.name to ktpState,
-    ChartLine.CHAMBER1.name to chamber1State,
-    ChartLine.CHAMBER2.name to chamber2State,
-    ChartLine.BASE_PLATE.name to basePlateState,
-    ChartLine.WATER.name to waterState,
-)
-
-private fun ChartUiState.Companion.fromPreference(savedStates: Map<String, Boolean>): ChartUiState {
-    val defaults = ChartUiState()
-    return ChartUiState(
-        intTempState = savedStates[ChartLine.INT_TEMP.name] ?: defaults.intTempState,
-        extTempState = savedStates[ChartLine.EXT_TEMP.name] ?: defaults.extTempState,
-        intHumidityState = savedStates[ChartLine.INT_HUMIDITY.name] ?: defaults.intHumidityState,
-        extHumidityState = savedStates[ChartLine.EXT_HUMIDITY.name] ?: defaults.extHumidityState,
-        ktpState = savedStates[ChartLine.KTP.name] ?: defaults.ktpState,
-        chamber1State = savedStates[ChartLine.CHAMBER1.name] ?: defaults.chamber1State,
-        chamber2State = savedStates[ChartLine.CHAMBER2.name] ?: defaults.chamber2State,
-        basePlateState = savedStates[ChartLine.BASE_PLATE.name] ?: defaults.basePlateState,
-        waterState = savedStates[ChartLine.WATER.name] ?: defaults.waterState,
-    )
-}

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

@@ -134,7 +134,6 @@ 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
@@ -584,22 +583,22 @@ class MainViewModel @Inject constructor(
         saveGuideBeamMinToPreference()
         saveGuideBeamMaxToPreference()
 
-        // Engineer 화면에서는 Min/Max 버튼에 따라 표시된 Min 또는 Max 값을 그대로 송신
+        // After updating the state, send the packet
-        val newMin = guideBeamMin.value
+        val newMin = guideBeamMin.value // get the potentially updated value
-        val newMax = guideBeamMax.value
+        val newMax = guideBeamMax.value // get the potentially updated value
-        val value = when (state) {
+        val guideBeam = guideBeam.value.toInt()
-            MinMaxUpDownState.MinDown,
-            MinMaxUpDownState.MinUp,
-            MinMaxUpDownState.MinLongDown,
-            MinMaxUpDownState.MinLongUp -> newMin
 
-            MinMaxUpDownState.MaxDown,
+        /*
-            MinMaxUpDownState.MaxUp,
+        val value = when(guideBeamValue) {
-            MinMaxUpDownState.MaxLongDown,
+            0 -> 0
-            MinMaxUpDownState.MaxLongUp -> newMax
+            1 -> newMin
+            10 -> newMax
+            else -> (newMin + (guideBeamValue - 1) * ((newMax - newMin) / 9))
         }
+        */
+        val value = (newMin + (guideBeam - 1) * ((newMax - newMin) / 9))
 
-        Timber.d("Engineer guideBeam tx value: $value, guideBeamMax: $newMax, guideBeamMin: $newMin")
+        Timber.d("guideBeam: $value, guideBeam: $guideBeam, guideBeamMax: $newMax, guideBeamMin: $newMin")
         txPacket(READ_WRITE.WRITE, CMD.GUIDE_BEAM, GuideBeam(value = value))
     }
 
@@ -815,62 +814,24 @@ class MainViewModel @Inject constructor(
     }
 
     fun txPacketOnce() {
-        viewModelScope.launch(dispatcherProvider.io) {
+        // viewModel init 으로 이동. 필요.
-            // txPacketOnce is called during app startup.
+        // 경고 정보 조회 (주기적 heart beat)
-            // Because serial open() is started in rxPacketLoop() asynchronously,
+        // repeatOnLifecycle은 Activity가 포그라운드에 있을 때로 한정지어, 특정 Lifecycle이 Trigger 되었을 때 동작하도록 만드는 block 임.
-            // 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 으로 이동. 필요.
+        // tx Version Read
-            // 경고 정보 조회 (주기적 heart beat)
+        txPacket(READ_WRITE.READ, CMD.VERSION, byteArrayOf(0x41.toByte()))
-            // repeatOnLifecycle은 Activity가 포그라운드에 있을 때로 한정지어, 특정 Lifecycle이 Trigger 되었을 때 동작하도록 만드는 block 임.
 
-            // tx Version Read
+        // tx Q-Switch Write
-            txPacket(READ_WRITE.READ, CMD.VERSION, byteArrayOf(0x41.toByte()))
+        txPacket(READ_WRITE.WRITE, CMD.Q_SWITCH, qSwitch.value)
 
-            // tx Q-Switch Write
+        // tx Guide Beam Write
-            txPacket(READ_WRITE.WRITE, CMD.Q_SWITCH, qSwitch.value)
+        txPacket(READ_WRITE.WRITE, CMD.GUIDE_BEAM, GuideBeam(value = guideBeam.value.toInt()))
 
-            // tx Oven Write (align with Engineer KTP write source)
+        // tx DCD_GAS Write (DEFAULT VALUE)
-            txPacket(READ_WRITE.WRITE, CMD.OVEN, Oven(ktp = temperature_write.value.ktp))
+        txPacket(READ_WRITE.WRITE, CMD.DCD_GAS, dcdGas.value.copy(status = 0x50))
 
-            // tx Guide Beam Write
+        // tx SPRAY_DCD Write (DEFAULT VALUE)
-            txPacket(READ_WRITE.WRITE, CMD.GUIDE_BEAM, GuideBeam(value = getGuideBeamTxValue()))
+        txPacket(READ_WRITE.WRITE, CMD.SPRAY_DCD, sprayDcd.value)
-
-            // 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.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
@@ -1106,7 +1067,7 @@ class MainViewModel @Inject constructor(
                 CMD.LASER_STATUS -> {
                     val l = packet.data.toLaserStatus()
                     setLaserStatus(l.copy())
-                    // on receive laser on (or interval) increase count and save to pref.
+                    // on receuve 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()
@@ -1185,19 +1146,58 @@ class MainViewModel @Inject constructor(
                     setEnergyControl(EnergyControl(0x03, 0x00))
                     setEnergyMeasured(EnergyMeasured(0x04, 0x00, 0x00))
 
-                    val connectedHandPieceLifeTime = when (h.type) {
+                    // hand piece 별 count 증가
-                        1 -> lifeTime.value.hp5x5
+                    when (h.type) {
-                        2 -> lifeTime.value.hp7x7
+                        1 -> {  // hp 5x5
-                        3 -> lifeTime.value.hp10x10
+                            setLifeTime(
-                        4 -> lifeTime.value.hp12x12
+                                _lifeTime.value.copy(
-                        5 -> lifeTime.value.hp3x15
+                                    hp5x5 = _lifeTime.value.hp5x5 + 1
+                                )
+                            )
+                            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("Unknown Hand-piece type: ${h.type}")
+                            Timber.d("unknwon 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,58 +2043,28 @@ 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(defaultPulseWidth).firstOrNull() ?: 0f,
+                fluence = energyTable.value.getKey2ListForKey1(0.5f).first(),
                 repetition = repetitionList.value.first(),
-                pulseWidth = defaultPulseWidth,
+                pulseWidth = PulseDurations.first(),
             )
         } else {
             preset
         }
-        applyPreset(newPreset)
-    }
 
-    fun applyPreset(preset: Preset) {
+        val fluenceList = energyTable.value.getKey2ListForKey1(newPreset.pulseWidth)
-        val newPreset = preset.copy()
 
         val pulseStep = PulseDurations.indexOf(newPreset.pulseWidth).takeIf {it != -1} ?: 0
-        val resolvedPulseWidth = PulseDurations[pulseStep]
+        val fluenceStep = fluenceList.indexOf(newPreset.fluence).takeIf {it != -1} ?: 0
-
+        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 = if (newFluenceList.isNotEmpty()) {
+        val fluenceAngle = fluenceStep.stepToDegree(totalSteps = fluenceList.size)
-            fluenceStep.stepToDegree(totalSteps = newFluenceList.size)
+        val repetitionAngle = repetitionStep.stepToDegree(totalSteps = repetitionList.value.size)
-        } else {
-            0f
-        }
-        val repetitionAngle = repetitionIndexToAngle(
-            index = repetitionStep,
-            totalSteps = newRepetitionList.size,
-        )
 
         Timber.d("pulseStep: ${pulseStep} fluenceStep: ${fluenceStep} repetitionStep: ${repetitionStep}")
 
@@ -2124,35 +2094,30 @@ 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, resolvedFluence)
+        val newHzType = hzTable.value.getValue(newPulseDuration, newFluence)
         val newRepetitionList = RepetitionsByColorKey[newHzType] ?: RepetitionsByColorKey[KEY_YELLOW]!!
         if (newRepetitionList != repetitionList.value) {
             setRepetitionList(newRepetitionList)
         }
 
-        // 4. Resolve and apply repetition by value (not by old angle/index).
+        // Smartly preserve Repetition Angle
-        val targetRepetition = currentRepetitionValue ?: 0f
+        // 4. Check if the old repetition value exists in the new list.
-        val resolvedRepetition = newRepetitionList.minByOrNull { abs(it - targetRepetition) } ?: 0f
+        val oldRepetitionIndex = if (currentRepetitionValue != null) {
-        val resolvedRepetitionIndex = newRepetitionList.indexOf(resolvedRepetition).takeIf { it >= 0 } ?: 0
+            newRepetitionList.indexOf(currentRepetitionValue)
-
-        if (newRepetitionList.isNotEmpty()) {
-            val resolvedRepetitionAngle = repetitionIndexToAngle(
-                index = resolvedRepetitionIndex,
-                totalSteps = newRepetitionList.size,
-            )
-            setRepetitionAngle(resolvedRepetitionAngle)
-            Timber.d("Resolved repetition by value: old=$currentRepetitionValue, new=$resolvedRepetition, angle=$resolvedRepetitionAngle")
         } else {
+            -1
+        }
+
+        if (oldRepetitionIndex != -1) {
+            // If the old value exists, set the slider to that position.
+            val preservedAngle = oldRepetitionIndex.stepToDegree(totalSteps = newRepetitionList.size)
+            setRepetitionAngle(preservedAngle)
+            Timber.d("Repetition value $currentRepetitionValue preserved at new angle $preservedAngle.")
+        } else {
+            // If it doesn't exist, THEN reset the slider to the beginning.
             setRepetitionAngle(0f)
-            Timber.d("Repetition list is empty. Resetting repetition angle to 0f.")
+            Timber.d("Repetition value $currentRepetitionValue not supported in new list. Resetting angle.")
         }
 
         // 5. Conditionally reset the fluence angle slider if needed
@@ -2165,7 +2130,7 @@ class MainViewModel @Inject constructor(
         // 6. Any change invalidates the current preset selection.
         setSelectedPresetIndex(0)
 
-        Timber.d("Updated Laser Parameters: pulse=$newPulseDuration, fluence=$resolvedFluence -> newRepListSize=${newRepetitionList.size}")
+        Timber.d("Updated Laser Parameters: pulse=$newPulseDuration, fluence=$newFluence -> newRepListSize=${newRepetitionList.size}")
     }
 
     /**
@@ -2185,16 +2150,13 @@ class MainViewModel @Inject constructor(
         setPulseAngle(newPulseStep.stepToDegree(totalSteps = PulseDurations.size))
 
         val newPulseDuration = PulseDurations[newPulseStep]
-        // Keep the current fluence value when pulse duration changes via slider.
+        // When pulse duration changes via slider, we use the first available fluence for the new list.
-        val currentFluenceStep = fluenceAngle.value.degreeToStep(totalSteps = fluenceList.value.size)
+        val firstFluence = energyTable.value.getKey2ListForKey1(newPulseDuration).firstOrNull() ?: 0f
-        val currentFluence = fluenceList.value.getOrNull(currentFluenceStep)
-            ?: energyTable.value.getKey2ListForKey1(newPulseDuration).firstOrNull()
-            ?: 0f
 
-        // Call the centralized helper using the preserved fluence value.
+        // Call the centralized helper, resetting the fluence slider.
         updateLaserParameters(
             newPulseDuration = newPulseDuration,
-            newFluence = currentFluence,
+            newFluence = firstFluence,
         )
     }
 
@@ -2206,17 +2168,12 @@ class MainViewModel @Inject constructor(
             setPulseAngle(newStep.stepToDegree(totalSteps = PulseDurations.size))
 
             val newPulseDuration = PulseDurations[newStep]
-            // 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.
             updateLaserParameters(
                 newPulseDuration = newPulseDuration,
-                newFluence = currentFluence,
+                newFluence = firstFluence,
             )
         }
     }
@@ -2259,12 +2216,8 @@ class MainViewModel @Inject constructor(
 
     fun onChangeRepetition(angle: Float) {
         // This logic is simple and has no complex dependencies, so it can remain as is.
-        val normalizedAngle = repetitionIndexToAngle(
+        if (angle != repetitionAngle.value) {
-            index = angle.degreeToStep(totalSteps = repetitionList.value.size),
+            setRepetitionAngle(angle)
-            totalSteps = repetitionList.value.size,
-        )
-        if (normalizedAngle != repetitionAngle.value) {
-            setRepetitionAngle(normalizedAngle)
         }
         setSelectedPresetIndex(0)
     }
@@ -2275,23 +2228,12 @@ class MainViewModel @Inject constructor(
         val newStep = if (state == UpDownState.Up) currentStep + 1 else currentStep - 1
 
         if (newStep in repetitionList.value.indices) {
-            val newRepetitionAngle = repetitionIndexToAngle(
+            val newRepetitionAngle = newStep.stepToDegree(totalSteps = repetitionList.value.size)
-                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
@@ -2344,4 +2286,4 @@ class MainViewModel @Inject constructor(
         // ONLY do light, non-IO variable initialization here.
         // DO NOT call load... functions here.
     }
-}
+}

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 - intervalTimeIntegerPart) * 10).toInt()
+    val intervalTimeFractionPart = ((this.intervalTime - delayTimeIntegerPart) * 10).toInt()
 
     val delayTimeArray = byteArrayOf(
         ((delayTimeIntegerPart.getNthDigit(2) + 0x30) and 0xFF).toByte(),

docs/change_summary_2026-03-04.md

@@ -1,23 +0,0 @@
-# 변경 요약 (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

@@ -1,41 +0,0 @@
-# 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) 수신 여부 확인