Skip to content

Commit 9a3831e

Browse files
Change discover handler to async
#117 non-breaking
1 parent 9bb4714 commit 9a3831e

5 files changed

Lines changed: 10 additions & 7 deletions

File tree

src/SharpBrick.PoweredUp.Cli/Program.cs

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -146,6 +146,9 @@ private static (ulong bluetoothAddress, SystemType systemType) FindAndSelectHub(
146146

147147
idx++;
148148
}
149+
150+
return Task.CompletedTask;
151+
149152
}, cts.Token);
150153

151154
var input = Console.ReadLine();

src/SharpBrick.PoweredUp.WinRT/WinRTPoweredUpBluetoothAdapter.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ namespace SharpBrick.PoweredUp.WinRT
1010
{
1111
public class WinRTPoweredUpBluetoothAdapter : IPoweredUpBluetoothAdapter
1212
{
13-
public void Discover(Action<PoweredUpBluetoothDeviceInfo> discoveryHandler, CancellationToken cancellationToken = default)
13+
public void Discover(Func<PoweredUpBluetoothDeviceInfo, Task> discoveryHandler, CancellationToken cancellationToken = default)
1414
{
1515
BluetoothLEAdvertisementWatcher watcher = new BluetoothLEAdvertisementWatcher();
1616
watcher.ScanningMode = BluetoothLEScanningMode.Active;
@@ -26,7 +26,7 @@ public void Discover(Action<PoweredUpBluetoothDeviceInfo> discoveryHandler, Canc
2626

2727
watcher.Start();
2828

29-
void ReceivedHandler(BluetoothLEAdvertisementWatcher watcher, BluetoothLEAdvertisementReceivedEventArgs eventArgs)
29+
async void ReceivedHandler(BluetoothLEAdvertisementWatcher watcher, BluetoothLEAdvertisementReceivedEventArgs eventArgs)
3030
{
3131
var info = new PoweredUpBluetoothDeviceInfo();
3232

@@ -47,7 +47,7 @@ void ReceivedHandler(BluetoothLEAdvertisementWatcher watcher, BluetoothLEAdverti
4747

4848
info.BluetoothAddress = eventArgs.BluetoothAddress;
4949

50-
discoveryHandler(info);
50+
await discoveryHandler(info);
5151
}
5252
}
5353

src/SharpBrick.PoweredUp/Bluetooth/IPoweredUpBluetoothAdapter.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ namespace SharpBrick.PoweredUp.Bluetooth
66
{
77
public interface IPoweredUpBluetoothAdapter
88
{
9-
void Discover(Action<PoweredUpBluetoothDeviceInfo> discoveryHandler, CancellationToken cancellationToken = default);
9+
void Discover(Func<PoweredUpBluetoothDeviceInfo, Task> discoveryHandler, CancellationToken cancellationToken = default);
1010

1111
Task<IPoweredUpBluetoothDevice> GetDeviceAsync(ulong bluetoothAddress);
1212
}

src/SharpBrick.PoweredUp/PoweredUpHost.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ public THub FindByName<THub>(string name) where THub : Hub, IDisposable
4343

4444
public void Discover(Func<Hub, Task> onDiscovery, CancellationToken token = default)
4545
{
46-
_bluetoothAdapter.Discover(deviceInfo =>
46+
_bluetoothAdapter.Discover(async deviceInfo =>
4747
{
4848
try
4949
{
@@ -55,7 +55,7 @@ public void Discover(Func<Hub, Task> onDiscovery, CancellationToken token = defa
5555

5656
_logger.LogInformation($"Discovered log of type {hub.GetType().Name} with name '{deviceInfo.Name}' on Bluetooth Address '{deviceInfo.BluetoothAddress}'");
5757

58-
onDiscovery(hub).Wait();
58+
await onDiscovery(hub);
5959
}
6060
}
6161
catch (Exception e)

test/SharpBrick.PoweredUp.Test/Bluetooth/PoweredUpBluetoothAdapterMock.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ public PoweredUpBluetoothAdapterMock()
2323
public PoweredUpBluetoothServiceMock MockService { get; }
2424
public PoweredUpBluetoothCharacteristicMock MockCharacteristic { get; }
2525

26-
public void Discover(Action<PoweredUpBluetoothDeviceInfo> discoveryHandler, CancellationToken cancellationToken = default)
26+
public void Discover(Func<PoweredUpBluetoothDeviceInfo, Task> discoveryHandler, CancellationToken cancellationToken = default)
2727
{
2828
throw new NotImplementedException();
2929
}

0 commit comments

Comments
 (0)