Compare commits
1 Commits
develop
...
feature/IS
| Author | SHA1 | Date | |
|---|---|---|---|
|
4a89f4562f |
@@ -1011,14 +1011,14 @@ fun EngineerScreen(
|
||||
if (ok) {
|
||||
Timber.d("onClick > lampCount: $value")
|
||||
|
||||
mainViewModel.setLifeTime(
|
||||
engineerViewModel.setLifeTime(
|
||||
lifeTime.copy(
|
||||
lamp = value
|
||||
)
|
||||
)
|
||||
|
||||
scope.launch {
|
||||
mainViewModel.saveLifeTimeToPreference()
|
||||
engineerViewModel.saveLifeTimeToPreference()
|
||||
}
|
||||
}
|
||||
showLifeTimeLampCountPopup = false
|
||||
@@ -1034,13 +1034,13 @@ fun EngineerScreen(
|
||||
onClick = { ok, value ->
|
||||
if (ok) {
|
||||
Timber.d("onClick > hp5x5: $value")
|
||||
mainViewModel.setLifeTime(
|
||||
engineerViewModel.setLifeTime(
|
||||
lifeTime.copy(
|
||||
hp5x5 = value
|
||||
)
|
||||
)
|
||||
scope.launch {
|
||||
mainViewModel.saveLifeTimeToPreference()
|
||||
engineerViewModel.saveLifeTimeToPreference()
|
||||
}
|
||||
}
|
||||
showLifeTypeHP5x5Popup = false
|
||||
@@ -1056,13 +1056,13 @@ fun EngineerScreen(
|
||||
onClick = { ok, value ->
|
||||
if (ok) {
|
||||
Timber.d("onClick > hp7x7: $value")
|
||||
mainViewModel.setLifeTime(
|
||||
engineerViewModel.setLifeTime(
|
||||
lifeTime.copy(
|
||||
hp7x7 = value
|
||||
)
|
||||
)
|
||||
scope.launch {
|
||||
mainViewModel.saveLifeTimeToPreference()
|
||||
engineerViewModel.saveLifeTimeToPreference()
|
||||
}
|
||||
}
|
||||
showLifeTimeHP7x7Popup = false
|
||||
@@ -1078,13 +1078,13 @@ fun EngineerScreen(
|
||||
onClick = { ok, value ->
|
||||
if (ok) {
|
||||
Timber.d("onClick > hp10x10: $value")
|
||||
mainViewModel.setLifeTime(
|
||||
engineerViewModel.setLifeTime(
|
||||
lifeTime.copy(
|
||||
hp10x10 = value
|
||||
)
|
||||
)
|
||||
scope.launch {
|
||||
mainViewModel.saveLifeTimeToPreference()
|
||||
engineerViewModel.saveLifeTimeToPreference()
|
||||
}
|
||||
}
|
||||
showLifeTimeHP10x10Popup = false
|
||||
@@ -1100,13 +1100,13 @@ fun EngineerScreen(
|
||||
onClick = { ok, value ->
|
||||
if (ok) {
|
||||
Timber.d("onClick > hp12x12: $value")
|
||||
mainViewModel.setLifeTime(
|
||||
engineerViewModel.setLifeTime(
|
||||
lifeTime.copy(
|
||||
hp12x12 = value
|
||||
)
|
||||
)
|
||||
scope.launch {
|
||||
mainViewModel.saveLifeTimeToPreference()
|
||||
engineerViewModel.saveLifeTimeToPreference()
|
||||
}
|
||||
}
|
||||
showLifeTimeHP12x12Popup = false
|
||||
@@ -1122,13 +1122,13 @@ fun EngineerScreen(
|
||||
onClick = { ok, value ->
|
||||
if (ok) {
|
||||
Timber.d("onClick > hp3x15: $value")
|
||||
mainViewModel.setLifeTime(
|
||||
engineerViewModel.setLifeTime(
|
||||
lifeTime.copy(
|
||||
hp3x15 = value
|
||||
)
|
||||
)
|
||||
scope.launch {
|
||||
mainViewModel.saveLifeTimeToPreference()
|
||||
engineerViewModel.saveLifeTimeToPreference()
|
||||
}
|
||||
}
|
||||
showLifeTimeHP3x15Popup = false
|
||||
@@ -1143,13 +1143,13 @@ fun EngineerScreen(
|
||||
onClick = { ok, value ->
|
||||
if (ok) {
|
||||
Timber.d("onClick > detector: $value")
|
||||
mainViewModel.setLifeTime(
|
||||
engineerViewModel.setLifeTime(
|
||||
lifeTime.copy(
|
||||
detector = value
|
||||
)
|
||||
)
|
||||
scope.launch {
|
||||
mainViewModel.saveLifeTimeToPreference()
|
||||
engineerViewModel.saveLifeTimeToPreference()
|
||||
}
|
||||
}
|
||||
showLifeTimeDetectorPopup = false
|
||||
@@ -1164,13 +1164,13 @@ fun EngineerScreen(
|
||||
onClick = { ok, value ->
|
||||
if (ok) {
|
||||
Timber.d("onClick > water: $value")
|
||||
mainViewModel.setLifeTime(
|
||||
engineerViewModel.setLifeTime(
|
||||
lifeTime.copy(
|
||||
water = value
|
||||
)
|
||||
)
|
||||
scope.launch {
|
||||
mainViewModel.saveLifeTimeToPreference()
|
||||
engineerViewModel.saveLifeTimeToPreference()
|
||||
}
|
||||
}
|
||||
showLifeTimeWaterPopup = false
|
||||
@@ -1187,7 +1187,7 @@ fun EngineerScreen(
|
||||
onClick = { ok, value ->
|
||||
if (ok) {
|
||||
Timber.d("onClick > ktp: $value")
|
||||
mainViewModel.setTemperatureWrite(
|
||||
engineerViewModel.setTemperatureWrite(
|
||||
temperatureWrite.copy(
|
||||
ktp = value.toFloat()
|
||||
)
|
||||
@@ -1199,12 +1199,12 @@ fun EngineerScreen(
|
||||
CMD.OVEN,
|
||||
Oven(
|
||||
type = 0x41,
|
||||
ktp = temperatureWrite.ktp
|
||||
ktp = value.toFloat()
|
||||
)
|
||||
)
|
||||
|
||||
scope.launch {
|
||||
mainViewModel.saveTemeratureWriteToPreference()
|
||||
engineerViewModel.saveTemeratureWriteToPreference()
|
||||
}
|
||||
}
|
||||
showTempKTPPopup = false
|
||||
@@ -1220,13 +1220,13 @@ fun EngineerScreen(
|
||||
if (ok) {
|
||||
Timber.d("onClick > chamber1: $value")
|
||||
|
||||
mainViewModel.setTemperatureWrite(
|
||||
engineerViewModel.setTemperatureWrite(
|
||||
temperatureWrite.copy(
|
||||
chamber1 = value.toFloat()
|
||||
)
|
||||
)
|
||||
scope.launch {
|
||||
mainViewModel.saveTemeratureWriteToPreference()
|
||||
engineerViewModel.saveTemeratureWriteToPreference()
|
||||
}
|
||||
}
|
||||
showTempChamber1Popup = false
|
||||
@@ -1241,13 +1241,13 @@ fun EngineerScreen(
|
||||
onClick = { ok, value ->
|
||||
if (ok) {
|
||||
Timber.d("onClick > chamber2: $value")
|
||||
mainViewModel.setTemperatureWrite(
|
||||
engineerViewModel.setTemperatureWrite(
|
||||
temperatureWrite.copy(
|
||||
chamber2 = value.toFloat()
|
||||
)
|
||||
)
|
||||
scope.launch {
|
||||
mainViewModel.saveTemeratureWriteToPreference()
|
||||
engineerViewModel.saveTemeratureWriteToPreference()
|
||||
}
|
||||
}
|
||||
showTempChamber2Popup = false
|
||||
@@ -1261,13 +1261,13 @@ fun EngineerScreen(
|
||||
count = temperatureWrite.water,
|
||||
onClick = { ok, value ->
|
||||
if (ok) {
|
||||
mainViewModel.setTemperatureWrite(
|
||||
engineerViewModel.setTemperatureWrite(
|
||||
temperatureWrite.copy(
|
||||
water = value.toFloat()
|
||||
)
|
||||
)
|
||||
scope.launch {
|
||||
mainViewModel.saveTemeratureWriteToPreference()
|
||||
engineerViewModel.saveTemeratureWriteToPreference()
|
||||
}
|
||||
}
|
||||
showTempWaterPopup = false
|
||||
@@ -1282,13 +1282,13 @@ fun EngineerScreen(
|
||||
onClick = { ok, value ->
|
||||
if (ok) {
|
||||
Timber.d("onClick > basePlate: $value")
|
||||
mainViewModel.setTemperatureWrite(
|
||||
engineerViewModel.setTemperatureWrite(
|
||||
temperatureWrite.copy(
|
||||
basePlate = value.toFloat()
|
||||
)
|
||||
)
|
||||
scope.launch {
|
||||
mainViewModel.saveTemeratureWriteToPreference()
|
||||
engineerViewModel.saveTemeratureWriteToPreference()
|
||||
}
|
||||
}
|
||||
showTempBaseplatePopup = false
|
||||
@@ -1393,9 +1393,9 @@ fun EngineerScreen(
|
||||
mainViewModel.saveLampCountToPreference()
|
||||
mainViewModel.saveSprayDcdListToPreference()
|
||||
mainViewModel.savePresetListToPreference()
|
||||
mainViewModel.saveLifeTimeToPreference()
|
||||
mainViewModel.saveTemeratureWriteToPreference()
|
||||
mainViewModel.saveEnergyMeasuredWriteToPreference()
|
||||
engineerViewModel.saveLifeTimeToPreference()
|
||||
engineerViewModel.saveTemeratureWriteToPreference()
|
||||
engineerViewModel.saveEnergyMeasuredWriteToPreference()
|
||||
mainViewModel.saveEnergyRefer2ToPreference()
|
||||
mainViewModel.saveProductSerialListToPreference()
|
||||
mainViewModel.savePowerSupplySerialListToPreference()
|
||||
@@ -1521,14 +1521,14 @@ fun EngineerScreen(
|
||||
},
|
||||
onClickSet = { v ->
|
||||
// write measured value
|
||||
mainViewModel.setEnergyMeasuredWrite(
|
||||
engineerViewModel.setEnergyMeasuredWrite(
|
||||
EnergyMeasured(
|
||||
measured = v
|
||||
)
|
||||
)
|
||||
|
||||
scope.launch {
|
||||
mainViewModel.saveEnergyMeasuredWriteToPreference()
|
||||
engineerViewModel.saveEnergyMeasuredWriteToPreference()
|
||||
}
|
||||
|
||||
/*
|
||||
@@ -1733,4 +1733,4 @@ fun PreviewEngineerView(
|
||||
mainViewModel = mainViewModel,
|
||||
engineerViewModel = engineerViewModel
|
||||
)
|
||||
}
|
||||
}
|
||||
|
||||
@@ -58,7 +58,7 @@ fun LifeTimeView(
|
||||
Spacer(modifier = Modifier.height(2.px.dp))
|
||||
|
||||
// Temp 0..7
|
||||
for (i in 0..lifeTimeTypes.size - 1) {
|
||||
for (i in 0..lifeTimeTypes.size -1) {
|
||||
val value = when (i) {
|
||||
0 -> lifeTime.lamp
|
||||
1 -> lifeTime.hp5x5
|
||||
|
||||
@@ -304,7 +304,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 +315,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 +332,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)
|
||||
|
||||
@@ -1106,7 +1106,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 +1185,58 @@ class MainViewModel @Inject constructor(
|
||||
setEnergyControl(EnergyControl(0x03, 0x00))
|
||||
setEnergyMeasured(EnergyMeasured(0x04, 0x00, 0x00))
|
||||
|
||||
val connectedHandPieceLifeTime = when (h.type) {
|
||||
1 -> lifeTime.value.hp5x5
|
||||
2 -> lifeTime.value.hp7x7
|
||||
3 -> lifeTime.value.hp10x10
|
||||
4 -> lifeTime.value.hp12x12
|
||||
5 -> lifeTime.value.hp3x15
|
||||
// hand piece 별 count 증가
|
||||
when (h.type) {
|
||||
1 -> { // hp 5x5
|
||||
setLifeTime(
|
||||
_lifeTime.value.copy(
|
||||
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)
|
||||
@@ -2091,10 +2130,11 @@ class MainViewModel @Inject constructor(
|
||||
} else {
|
||||
0f
|
||||
}
|
||||
val repetitionAngle = repetitionIndexToAngle(
|
||||
index = repetitionStep,
|
||||
totalSteps = newRepetitionList.size,
|
||||
)
|
||||
val repetitionAngle = if (newRepetitionList.isNotEmpty()) {
|
||||
repetitionStep.stepToDegree(totalSteps = newRepetitionList.size)
|
||||
} else {
|
||||
0f
|
||||
}
|
||||
|
||||
Timber.d("pulseStep: ${pulseStep} fluenceStep: ${fluenceStep} repetitionStep: ${repetitionStep}")
|
||||
|
||||
@@ -2138,21 +2178,23 @@ class MainViewModel @Inject constructor(
|
||||
setRepetitionList(newRepetitionList)
|
||||
}
|
||||
|
||||
// 4. Resolve and apply repetition by value (not by old angle/index).
|
||||
val targetRepetition = currentRepetitionValue ?: 0f
|
||||
val resolvedRepetition = newRepetitionList.minByOrNull { abs(it - targetRepetition) } ?: 0f
|
||||
val resolvedRepetitionIndex = newRepetitionList.indexOf(resolvedRepetition).takeIf { it >= 0 } ?: 0
|
||||
|
||||
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")
|
||||
// Smartly preserve Repetition Angle
|
||||
// 4. Check if the old repetition value exists in the new list.
|
||||
val oldRepetitionIndex = if (currentRepetitionValue != null) {
|
||||
newRepetitionList.indexOf(currentRepetitionValue)
|
||||
} 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
|
||||
@@ -2259,12 +2301,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(
|
||||
index = angle.degreeToStep(totalSteps = repetitionList.value.size),
|
||||
totalSteps = repetitionList.value.size,
|
||||
)
|
||||
if (normalizedAngle != repetitionAngle.value) {
|
||||
setRepetitionAngle(normalizedAngle)
|
||||
if (angle != repetitionAngle.value) {
|
||||
setRepetitionAngle(angle)
|
||||
}
|
||||
setSelectedPresetIndex(0)
|
||||
}
|
||||
@@ -2275,23 +2313,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(
|
||||
index = newStep,
|
||||
totalSteps = repetitionList.value.size,
|
||||
)
|
||||
val newRepetitionAngle = newStep.stepToDegree(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
|
||||
|
||||
Reference in New Issue
Block a user