diff --git a/app/src/main/java/com/example/medilightv2android/ble/PiezoPacketCollector.kt b/app/src/main/java/com/example/medilightv2android/ble/PiezoPacketCollector.kt index d713b32..1f3fe8d 100644 --- a/app/src/main/java/com/example/medilightv2android/ble/PiezoPacketCollector.kt +++ b/app/src/main/java/com/example/medilightv2android/ble/PiezoPacketCollector.kt @@ -43,6 +43,9 @@ class PiezoPacketCollector { // Callbacks var onComplete: ((PiezoEchoResult) -> Unit)? = null var onMultiChannelComplete: ((List) -> Unit)? = null + /** true 면 다음 onMultiChannelComplete 1회 skip (자동 reset). + * posture polling 으로 mtb 보낼 때 측정 callback 가 spurious fire 되는 거 차단용. */ + var skipNextComplete: Boolean = false var onLog: ((String) -> Unit)? = null private var recursionDepth = 0 @@ -228,7 +231,12 @@ class PiezoPacketCollector { else -> { val validChannels = channelResults.filterNotNull() onLog?.invoke("raa: session=$currentSetSession complete — ${validChannels.size} channels") - onMultiChannelComplete?.invoke(validChannels) + if (skipNextComplete) { + skipNextComplete = false + onLog?.invoke("raa: skip onComplete (posture poll)") + } else { + onMultiChannelComplete?.invoke(validChannels) + } } } // 다음 set을 위해 reset (isMultiChannel/onComplete 등 유지) diff --git a/app/src/main/java/com/example/medilightv2android/ui/views/monitoring/PiezoMonitoringView.kt b/app/src/main/java/com/example/medilightv2android/ui/views/monitoring/PiezoMonitoringView.kt index c54118c..b3985c5 100644 --- a/app/src/main/java/com/example/medilightv2android/ui/views/monitoring/PiezoMonitoringView.kt +++ b/app/src/main/java/com/example/medilightv2android/ui/views/monitoring/PiezoMonitoringView.kt @@ -591,7 +591,10 @@ fun PiezoMonitoringView(appState: AppState) { } } - // IMU polling + 자세 분류 (Phase 1) — 5초 주기로 msp 명령 → rsp: 응답 받아 분류. + // IMU polling + 자세 분류 (Phase 1) — 10초 주기로 mtb 명령 → rim: 응답 받아 분류. + // msp 가 펌웨어에서 rsp: 응답 안 보내는 듯해 mtb (alignment) 로 우회. + // mtb 는 piezo measurement 도 트리거하므로 piezoCollector.skipNextComplete 로 + // user 의 측정 callback 가 spurious fire 되는 거 차단. LaunchedEffect(isConnected, isDemoMode) { Log.d("ImuDbg", "LaunchedEffect start isConnected=$isConnected isDemoMode=$isDemoMode") if (isDemoMode) { @@ -609,13 +612,18 @@ fun PiezoMonitoringView(appState: AppState) { Log.d("ImuDbg", "imuCollector log: $msg") } while (isActive) { - if (isConnected) { - Log.d("ImuDbg", "→ sendImuQuery (msp)") - bleManager.sendImuQuery() + if (isConnected && !isMeasuring && !isAutoMeasuring && !isSpotInProgress) { + Log.d("ImuDbg", "→ sendMtb (posture poll)") + bleManager.piezoCollector.skipNextComplete = true + val sent = bleManager.sendMtb() + if (!sent) { + bleManager.piezoCollector.skipNextComplete = false // throttled, no response coming + Log.d("ImuDbg", "mtb throttled — skip this cycle") + } } else { - Log.d("ImuDbg", "skip (not connected)") + Log.d("ImuDbg", "skip (connected=$isConnected measuring=$isMeasuring auto=$isAutoMeasuring spot=$isSpotInProgress)") } - kotlinx.coroutines.delay(5000) + kotlinx.coroutines.delay(10000) } }