steven/raman
1
1
Fork 0
Code Issues 20 Pull Requests 1 Actions Packages Releases Wiki Activity

Compare commits

base: steven:5d98419ef2322818a58c7bea1138b0440553d88d
Branches Tags
steven:develop steven:feature/ISSUE-62 steven:feature/ISSUE-22 steven:master
..
compare: steven:develop
Branches Tags
steven:develop steven:feature/ISSUE-62 steven:feature/ISSUE-22 steven:master

2 Commits
5d98419ef2 ... develop

Author SHA1 Message Date
steven
f420d19a6f Merge pull request 'H/P 연결할 때마다 Lifetime 기준값이 1씩 증가하는 버그 수정' (#64) from feature/ISSUE-14,15 into develop 
Reviewed-on: #64
 2026-03-18 08:00:29 +00:00
StevenBuzzi
6f2d24717d H/P 연결할 때마다 Lifetime 기준값이 1씩 증가하는 버그 수정 2026-03-18 11:58:07 +09:00
2 changed files with 4 additions and 9 deletions
Expand all files Collapse all files

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

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

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

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