Merge remote-tracking branch 'origin/feature/ISSUE-51' into feature/ISSUE-51

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

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/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/ui/screens/engineer/EngineerScreen.kt

@@ -1011,14 +1011,14 @@ fun EngineerScreen(
                     if (ok) {
                         Timber.d("onClick > lampCount: $value")
 
-                        engineerViewModel.setLifeTime(
+                        mainViewModel.setLifeTime(
                             lifeTime.copy(
                                 lamp = value
                             )
                         )
 
                         scope.launch {
-                            engineerViewModel.saveLifeTimeToPreference()
+                            mainViewModel.saveLifeTimeToPreference()
                         }
                     }
                     showLifeTimeLampCountPopup = false
@@ -1034,13 +1034,13 @@ fun EngineerScreen(
                 onClick = { ok, value ->
                     if (ok) {
                         Timber.d("onClick > hp5x5: $value")
-                        engineerViewModel.setLifeTime(
+                        mainViewModel.setLifeTime(
                             lifeTime.copy(
                                 hp5x5 = value
                             )
                         )
                         scope.launch {
-                            engineerViewModel.saveLifeTimeToPreference()
+                            mainViewModel.saveLifeTimeToPreference()
                         }
                     }
                     showLifeTypeHP5x5Popup = false
@@ -1056,13 +1056,13 @@ fun EngineerScreen(
                 onClick = { ok, value ->
                     if (ok) {
                         Timber.d("onClick > hp7x7: $value")
-                        engineerViewModel.setLifeTime(
+                        mainViewModel.setLifeTime(
                             lifeTime.copy(
                                 hp7x7 = value
                             )
                         )
                         scope.launch {
-                            engineerViewModel.saveLifeTimeToPreference()
+                            mainViewModel.saveLifeTimeToPreference()
                         }
                     }
                     showLifeTimeHP7x7Popup = false
@@ -1078,13 +1078,13 @@ fun EngineerScreen(
                 onClick = { ok, value ->
                     if (ok) {
                         Timber.d("onClick > hp10x10: $value")
-                        engineerViewModel.setLifeTime(
+                        mainViewModel.setLifeTime(
                             lifeTime.copy(
                                 hp10x10 = value
                             )
                         )
                         scope.launch {
-                            engineerViewModel.saveLifeTimeToPreference()
+                            mainViewModel.saveLifeTimeToPreference()
                         }
                     }
                     showLifeTimeHP10x10Popup = false
@@ -1100,13 +1100,13 @@ fun EngineerScreen(
                 onClick = { ok, value ->
                     if (ok) {
                         Timber.d("onClick > hp12x12: $value")
-                        engineerViewModel.setLifeTime(
+                        mainViewModel.setLifeTime(
                             lifeTime.copy(
                                 hp12x12 = value
                             )
                         )
                         scope.launch {
-                            engineerViewModel.saveLifeTimeToPreference()
+                            mainViewModel.saveLifeTimeToPreference()
                         }
                     }
                     showLifeTimeHP12x12Popup = false
@@ -1122,13 +1122,13 @@ fun EngineerScreen(
                 onClick = { ok, value ->
                     if (ok) {
                         Timber.d("onClick > hp3x15: $value")
-                        engineerViewModel.setLifeTime(
+                        mainViewModel.setLifeTime(
                             lifeTime.copy(
                                 hp3x15 = value
                             )
                         )
                         scope.launch {
-                            engineerViewModel.saveLifeTimeToPreference()
+                            mainViewModel.saveLifeTimeToPreference()
                         }
                     }
                     showLifeTimeHP3x15Popup = false
@@ -1143,13 +1143,13 @@ fun EngineerScreen(
                 onClick = { ok, value ->
                     if (ok) {
                         Timber.d("onClick > detector: $value")
-                        engineerViewModel.setLifeTime(
+                        mainViewModel.setLifeTime(
                             lifeTime.copy(
                                 detector = value
                             )
                         )
                         scope.launch {
-                            engineerViewModel.saveLifeTimeToPreference()
+                            mainViewModel.saveLifeTimeToPreference()
                         }
                     }
                     showLifeTimeDetectorPopup = false
@@ -1164,13 +1164,13 @@ fun EngineerScreen(
                 onClick = { ok, value ->
                     if (ok) {
                         Timber.d("onClick > water: $value")
-                        engineerViewModel.setLifeTime(
+                        mainViewModel.setLifeTime(
                             lifeTime.copy(
                                 water = value
                             )
                         )
                         scope.launch {
-                            engineerViewModel.saveLifeTimeToPreference()
+                            mainViewModel.saveLifeTimeToPreference()
                         }
                     }
                     showLifeTimeWaterPopup = false
@@ -1187,7 +1187,7 @@ fun EngineerScreen(
                 onClick = { ok, value ->
                     if (ok) {
                         Timber.d("onClick > ktp: $value")
-                        engineerViewModel.setTemperatureWrite(
+                        mainViewModel.setTemperatureWrite(
                             temperatureWrite.copy(
                                 ktp = value.toFloat()
                             )
@@ -1199,12 +1199,12 @@ fun EngineerScreen(
                             CMD.OVEN,
                             Oven(
                                 type = 0x41,
-                                ktp = value.toFloat()
+                                ktp = temperatureWrite.ktp
                             )
                         )
 
                         scope.launch {
-                            engineerViewModel.saveTemeratureWriteToPreference()
+                            mainViewModel.saveTemeratureWriteToPreference()
                         }
                     }
                     showTempKTPPopup = false
@@ -1220,13 +1220,13 @@ fun EngineerScreen(
                     if (ok) {
                         Timber.d("onClick > chamber1: $value")
 
-                        engineerViewModel.setTemperatureWrite(
+                        mainViewModel.setTemperatureWrite(
                             temperatureWrite.copy(
                                 chamber1 = value.toFloat()
                             )
                         )
                         scope.launch {
-                            engineerViewModel.saveTemeratureWriteToPreference()
+                            mainViewModel.saveTemeratureWriteToPreference()
                         }
                     }
                     showTempChamber1Popup = false
@@ -1241,13 +1241,13 @@ fun EngineerScreen(
                 onClick = { ok, value ->
                     if (ok) {
                         Timber.d("onClick > chamber2: $value")
-                        engineerViewModel.setTemperatureWrite(
+                        mainViewModel.setTemperatureWrite(
                             temperatureWrite.copy(
                                 chamber2 = value.toFloat()
                             )
                         )
                         scope.launch {
-                            engineerViewModel.saveTemeratureWriteToPreference()
+                            mainViewModel.saveTemeratureWriteToPreference()
                         }
                     }
                     showTempChamber2Popup = false
@@ -1261,13 +1261,13 @@ fun EngineerScreen(
                 count = temperatureWrite.water,
                 onClick = { ok, value ->
                     if (ok) {
-                        engineerViewModel.setTemperatureWrite(
+                        mainViewModel.setTemperatureWrite(
                             temperatureWrite.copy(
                                 water = value.toFloat()
                             )
                         )
                         scope.launch {
-                            engineerViewModel.saveTemeratureWriteToPreference()
+                            mainViewModel.saveTemeratureWriteToPreference()
                         }
                     }
                     showTempWaterPopup = false
@@ -1282,13 +1282,13 @@ fun EngineerScreen(
                 onClick = { ok, value ->
                     if (ok) {
                         Timber.d("onClick > basePlate: $value")
-                        engineerViewModel.setTemperatureWrite(
+                        mainViewModel.setTemperatureWrite(
                             temperatureWrite.copy(
                                 basePlate = value.toFloat()
                             )
                         )
                         scope.launch {
-                            engineerViewModel.saveTemeratureWriteToPreference()
+                            mainViewModel.saveTemeratureWriteToPreference()
                         }
                     }
                     showTempBaseplatePopup = false
@@ -1393,9 +1393,9 @@ fun EngineerScreen(
                         mainViewModel.saveLampCountToPreference()
                         mainViewModel.saveSprayDcdListToPreference()
                         mainViewModel.savePresetListToPreference()
-                        engineerViewModel.saveLifeTimeToPreference()
+                        mainViewModel.saveLifeTimeToPreference()
-                        engineerViewModel.saveTemeratureWriteToPreference()
+                        mainViewModel.saveTemeratureWriteToPreference()
-                        engineerViewModel.saveEnergyMeasuredWriteToPreference()
+                        mainViewModel.saveEnergyMeasuredWriteToPreference()
                         mainViewModel.saveEnergyRefer2ToPreference()
                         mainViewModel.saveProductSerialListToPreference()
                         mainViewModel.savePowerSupplySerialListToPreference()
@@ -1521,14 +1521,14 @@ fun EngineerScreen(
                 },
                 onClickSet = { v ->
                     // write measured value
-                    engineerViewModel.setEnergyMeasuredWrite(
+                    mainViewModel.setEnergyMeasuredWrite(
                         EnergyMeasured(
                             measured = v
                         )
                     )
 
                     scope.launch {
-                        engineerViewModel.saveEnergyMeasuredWriteToPreference()
+                        mainViewModel.saveEnergyMeasuredWriteToPreference()
                     }
 
                     /*
@@ -1733,4 +1733,4 @@ fun PreviewEngineerView(
         mainViewModel = mainViewModel,
         engineerViewModel = engineerViewModel
     )
-}
+}

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

@@ -780,25 +780,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)

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
@@ -843,9 +842,8 @@ class MainViewModel @Inject constructor(
             // tx DCD_GAS Write (DEFAULT VALUE)
             txPacket(READ_WRITE.WRITE, CMD.DCD_GAS, dcdGas.value.copy(status = 0x50))
 
-            // tx SPRAY_DCD Write (DEFAULT VALUE)
+        // tx SPRAY_DCD Write (DEFAULT VALUE)
-            txPacket(READ_WRITE.WRITE, CMD.SPRAY_DCD, sprayDcd.value.copy(status = 0x41))
+        txPacket(READ_WRITE.WRITE, CMD.SPRAY_DCD, sprayDcd.value.copy(status = 0x41))
-        }
     }
 
     private suspend fun waitUntilSerialReady(
@@ -2082,59 +2080,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 = if (newRepetitionList.isNotEmpty()) {
-            repetitionStep.stepToDegree(totalSteps = newRepetitionList.size)
-        } else {
-            0f
-        }
 
         Timber.d("pulseStep: ${pulseStep} fluenceStep: ${fluenceStep} repetitionStep: ${repetitionStep}")
 
@@ -2164,15 +2131,8 @@ 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)
@@ -2207,7 +2167,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}")
     }
 
     /**
@@ -2227,16 +2187,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,
         )
     }
 
@@ -2248,17 +2205,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,
             )
         }
     }