Merge remote-tracking branch 'origin/feature/ISSUE-14,15' into feature/ISSUE-14,15

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

@@ -392,10 +392,13 @@ class PresetViewModel @Inject constructor(
         val newRepetitionIndex = repetitionList.value.indexOf(repetition).takeIf { it != -1 } ?: 0
         val newRepetition = if (isUp == UpDownState.Up) {
             // Original logic: repetitionIndex < PulseDurations.size -1 (Likely a typo, should be Repetitions.size)
-            if (newRepetitionIndex < repetitionList.value.size - 1) repetitionList.value[newRepetitionIndex + 1] else repetition
-        } else {
+            if(newRepetitionIndex < repetitionList.value.size - 1) repetitionList.value[newRepetitionIndex + 1]
+            else repetition
+        }
+        else {
             // Original logic: repetitionIndex > 1
-            if (newRepetitionIndex > 0) repetitionList.value[newRepetitionIndex - 1] else repetition
+            if (newRepetitionIndex > 0) repetitionList.value[newRepetitionIndex - 1]
+            else repetition
         }
 
         val updatedPreset = currentList[index].copy(repetition = newRepetition)

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

@@ -1117,6 +1117,9 @@ class MainViewModel @Inject constructor(
                         increaseLampCount()
                         saveLampCountToPreference()
 
+                        Timber.d("Laser shot: lampCount=${_lampCount.value}, laserCount=${_laserCount.value} " +
+                                "handPieceType=${handPiece.value.type}, hpCount=${hpCount.value}")
+
                         val repetitionIndex = repetitionAngle.value.degreeToStep(totalSteps = repetitionList.value.size)
                         val repetition = repetitionList.value[repetitionIndex]
                         Timber.d("repetition: ${repetition}")
@@ -1198,7 +1201,6 @@ class MainViewModel @Inject constructor(
                     }
                     Timber.d("HAND_PIECE lifetime: type=${h.type}, value=${connectedHandPieceLifeTime}, hpCount=${hpCount.value}")
 
-
                     // hand piece가 변경 시점 에서, pref 테이블 값을 -> energyTable 로 로딩
                     loadFluenceTable(handPiece.value.type)