Skip to content

Fix timeout issue sideload FW on iOS #82

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
asyba wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fix timeout issue sideload FW on iOS #82

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 4 additions & 5 deletions ...rc/iosMain/kotlin/io/rebble/libpebblecommon/connection/bt/ble/transport/GattServer.ios.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -226,6 +226,7 @@ actual class GattServer(
return try {
withTimeout(SEND_TIMEOUT) {
while (true) {
val startCount = peripheralManagerReadyCount.value
if (peripheralManager.updateValue(
value = data.toNSData(),
forCharacteristic = cbCharacteristic,
Expand All @@ -235,7 +236,7 @@ actual class GattServer(
return@withTimeout true
}
// Write did not succeed; wait for queue to drain
peripheralManagerReady.first()
peripheralManagerReadyCount.first { it > startCount }
}
false
}
Expand Down Expand Up @@ -338,13 +339,11 @@ actual class GattServer(
}
}

private val peripheralManagerReady = MutableSharedFlow<Unit>()
private val peripheralManagerReadyCount = MutableStateFlow(0L)

override fun peripheralManagerIsReadyToUpdateSubscribers(peripheral: CBPeripheralManager) {
verboseLog { "peripheralManagerIsReadyToUpdateSubscribers" }
runBlocking {
peripheralManagerReady.emit(Unit)
}
peripheralManagerReadyCount.value++
}
}

Expand Down
2 changes: 2 additions & 0 deletions libpebble3/src/iosMain/kotlin/io/rebble/libpebblecommon/di/LibPebbleModule.ios.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,5 +74,7 @@ actual val platformModule: Module = module {
fallbackToResetRequest = true,
closeGattServerWhenBtDisabled = false,
delayBleConnectionsAfterAppStart = true,
desiredTxWindow = 6,
desiredRxWindow = 6,
) }
}