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

Merge pull request 'Guide beam packet 오전송 수정' (#47) from feature/ISSUE-5 into develop

Browse Source 
Reviewed-on: #47
This commit was merged in pull request #47.
This commit is contained in:
steven
2026-03-03 08:55:48 +00:00
parent a817a5f14f d0b8a78847
commit fac756eacb
2 changed files with 23 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

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

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

@@ -583,22 +583,22 @@ class MainViewModel @Inject constructor(
saveGuideBeamMinToPreference() saveGuideBeamMinToPreference()
saveGuideBeamMaxToPreference() saveGuideBeamMaxToPreference()
// After updating the state, send the packet // Engineer 화면에서는 Min/Max 버튼에 따라 표시된 Min 또는 Max 값을 그대로 송신
val newMin = guideBeamMin.value // get the potentially updated value val newMin = guideBeamMin.value
val newMax = guideBeamMax.value // get the potentially updated value val newMax = guideBeamMax.value
val guideBeam = guideBeam.value.toInt() val value = when (state) {
MinMaxUpDownState.MinDown,
MinMaxUpDownState.MinUp,
MinMaxUpDownState.MinLongDown,
MinMaxUpDownState.MinLongUp -> newMin
/* MinMaxUpDownState.MaxDown,
val value = when(guideBeamValue) { MinMaxUpDownState.MaxUp,
0 -> 0 MinMaxUpDownState.MaxLongDown,
1 -> newMin MinMaxUpDownState.MaxLongUp -> newMax
10 -> newMax
else -> (newMin + (guideBeamValue - 1) * ((newMax - newMin) / 9))
} }
*/
val value = (newMin + (guideBeam - 1) * ((newMax - newMin) / 9))
Timber.d("guideBeam: $value, guideBeam: $guideBeam, guideBeamMax: $newMax, guideBeamMin: $newMin") Timber.d("Engineer guideBeam tx value: $value, guideBeamMax: $newMax, guideBeamMin: $newMin")
txPacket(READ_WRITE.WRITE, CMD.GUIDE_BEAM, GuideBeam(value = value)) txPacket(READ_WRITE.WRITE, CMD.GUIDE_BEAM, GuideBeam(value = value))
} }
@@ -2286,4 +2286,4 @@ class MainViewModel @Inject constructor(
// ONLY do light, non-IO variable initialization here. // ONLY do light, non-IO variable initialization here.
// DO NOT call load... functions here. // DO NOT call load... functions here.
} }
} }