Skip to content

Count only pairing candidates during pod discovery #167

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

Merged
marionbarker merged 2 commits into from
Sep 22, 2026
Merged

Count only pairing candidates during pod discovery #167

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
24d721b
Count only pairable pods during pairing discovery
ps2 Sep 21, 2026
173e413
Treat our own pod as a pairing candidate; pre-connect only our pod
ps2 Sep 21, 2026
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
2 changes: 1 addition & 1 deletion OmnipodKit/Bluetooth/BlePodComms.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@ class BlePodComms: PodComms {
// would hang without ever timing out. Always schedule on the main run loop.
DispatchQueue.main.async {
Timer.scheduledTimer(withTimeInterval: 1, repeats: true) { timer in
let devices = self.bluetoothManager.getConnectedDevices()
let devices = self.bluetoothManager.getConnectedPairingCandidates()

if devices.count > 1 {
self.log.default("Multiple pods found while scanning")
Expand Down
9 changes: 6 additions & 3 deletions OmnipodKit/Bluetooth/BluetoothManager.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -846,7 +846,7 @@ class BluetoothManager: NSObject {
delayedProbeInFlight = false
alarmScanSuppressed = false
manager.stopScan()
for device in devices {
for device in devices where autoConnectIDs.contains(device.manager.peripheral.identifier.uuidString) {
let peripheral = device.manager.peripheral
switch peripheral.state {
case .connecting where !isConnectWatchdogActive(peripheral):
Expand Down Expand Up @@ -1302,10 +1302,13 @@ class BluetoothManager: NSObject {

// MARK: - Accessors

func getConnectedDevices() -> [Omni] {
func getConnectedPairingCandidates() -> [Omni] {
var connected: [Omni] = []
managerQueue.sync {
connected = self.devices.filter { $0.manager.peripheral.state == .connected }
connected = self.devices.filter {
$0.manager.peripheral.state == .connected &&
($0.advertisement?.pairable == true || self.autoConnectIDs.contains($0.manager.peripheral.identifier.uuidString))
}
}
return connected
}
Expand Down