Skip to content

Add flag to only stop device scan if it as started at least once before #37

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
MartinaeyNL merged 2 commits into from
Aug 6, 2026
Merged

Add flag to only stop device scan if it as started at least once before #37

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
38d04c0
Add flag to only stop device scan if it as started at least once before
ebariaux Aug 4, 2026
23e49c0
Made properties private and changed to constant where appropriate
ebariaux Aug 5, 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
12 changes: 10 additions & 2 deletions ORLib/ConsoleProviders/ESPProvision/DeviceRegistry.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,13 @@ protocol ORESPProvisionManager {
func stopESPDevicesSearch()
}

struct EspressifProvisionManager: ORESPProvisionManager {
var provisionManager: ESPProvisionManager = ESPProvisionManager.shared
class EspressifProvisionManager: ORESPProvisionManager {
private let provisionManager: ESPProvisionManager
private var searchedAtLeastOnce = false

init(provisionManager: ESPProvisionManager = ESPProvisionManager.shared) {
self.provisionManager = provisionManager
}

public func searchESPDevices(devicePrefix: String, transport: ESPTransport, security: ESPSecurity = .secure) async throws -> [ORESPDevice] {
return try await withCheckedThrowingContinuation { continuation in
Expand All @@ -37,6 +42,7 @@ struct EspressifProvisionManager: ORESPProvisionManager {
// even after the search has already completed with a list of device
var alreadyResumed = false

searchedAtLeastOnce = true
provisionManager.searchESPDevices(devicePrefix: devicePrefix, transport: transport, security: security) { deviceList, error in
if let error {
if !alreadyResumed {
Expand All @@ -52,6 +58,8 @@ struct EspressifProvisionManager: ORESPProvisionManager {
}

public func stopESPDevicesSearch() {
// ESPProvisionManager.stopESPDevicesSearch crashes by force unwrapping nil if it did not perform a search before
guard searchedAtLeastOnce else { return }
provisionManager.stopESPDevicesSearch()
}
}
Expand Down
Loading