Rename "Xamarin" to "Mobile"

README.md

@@ -21,7 +21,7 @@ SharpBrick.PoweredUp is a .NET implementation of the Bluetooth Low Energy Protoc
 - **Virtual Port Creation**: Combine multiple devices of the same type into a virtual combined port. This allows synchronous access to multiple devices using the same message (e.g. using two motors for driving).
 - **Deployment Model Verification**: The SDK includes a model builder and a verification method to ensure that the wired devies are correctly reflecting the expectations in the program.
 - **Tools**: The `poweredup` CLI includes a device list feature, enumerating the metadata properties of the LEGO Wireless Protocol.
-- **Support for multiple Bluetooth Stacks**: Use either Microsoft WinRT, BlueGiga Bluetooth (Silicon's Lab BlueGiga-adapter, for example BLED112) or Xamarin using BLE.Plugin to talk to your Lego hubs.
+- **Support for multiple Bluetooth Stacks**: Use either Microsoft WinRT, BlueGiga Bluetooth (Silicon's Lab BlueGiga-adapter, for example BLED112) or MAUI using [Plugin.BLE](https://github.com/dotnet-bluetooth-le/dotnet-bluetooth-le) to talk to your Lego hubs.
 
 # Examples
 

src/SharpBrick.PoweredUp.Mobile/IServiceCollectionExtensionsForXamarin.cs → src/SharpBrick.PoweredUp.Mobile/IServiceCollectionExtensionsForMobile.cs

@@ -1,16 +1,16 @@
-using Microsoft.Extensions.DependencyInjection;
-using Plugin.BLE;
-using Plugin.BLE.Abstractions.Contracts;
-using SharpBrick.PoweredUp.Bluetooth;
-
-namespace SharpBrick.PoweredUp.Mobile
-{
-    public static class IServiceCollectionExtensionsForXamarin
-    {
-        public static IServiceCollection AddXamarinBluetooth(this IServiceCollection self, INativeDeviceInfoProvider deviceInfoProvider)
-            => self
-               .AddSingleton<IBluetoothLE>(CrossBluetoothLE.Current)
-               .AddSingleton<INativeDeviceInfoProvider>(deviceInfoProvider)
-               .AddSingleton<IPoweredUpBluetoothAdapter, XamarinPoweredUpBluetoothAdapter>();
-    }
-}
+using Microsoft.Extensions.DependencyInjection;
+using Plugin.BLE;
+using Plugin.BLE.Abstractions.Contracts;
+using SharpBrick.PoweredUp.Bluetooth;
+
+namespace SharpBrick.PoweredUp.Mobile
+{
+    public static class IServiceCollectionExtensionsForMobile
+    {
+        public static IServiceCollection AddMobileBluetooth(this IServiceCollection self, INativeDeviceInfoProvider deviceInfoProvider)
+            => self
+               .AddSingleton<IBluetoothLE>(CrossBluetoothLE.Current)
+               .AddSingleton<INativeDeviceInfoProvider>(deviceInfoProvider)
+               .AddSingleton<IPoweredUpBluetoothAdapter, MobilePoweredUpBluetoothAdapter>();
+    }
+}

src/SharpBrick.PoweredUp.Mobile/XamarinBluetoothDeviceInfo.cs → src/SharpBrick.PoweredUp.Mobile/MobileBluetoothDeviceInfo.cs

@@ -1,11 +1,10 @@
 using System;
-using System.Runtime.InteropServices;
 using SharpBrick.PoweredUp.Bluetooth;
 using SharpBrick.PoweredUp.Utils;
 
 namespace SharpBrick.PoweredUp.Mobile
 {
-    public class XamarinBluetoothDeviceInfo : IPoweredUpBluetoothDeviceInfo, IPoweredUpBluetoothDeviceInfoWithMacAddress
+    public class MobileBluetoothDeviceInfo : IPoweredUpBluetoothDeviceInfo, IPoweredUpBluetoothDeviceInfoWithMacAddress
     {
         private string _deviceIdentifier;
 
@@ -29,9 +28,9 @@ public string DeviceIdentifier
 
         public bool Equals(IPoweredUpBluetoothDeviceInfo other)
         {
-            if (other != null && other is XamarinBluetoothDeviceInfo otherXamarin)
+            if (other != null && other is MobileBluetoothDeviceInfo otherDeviceInfo)
             {
-                return this.DeviceIdentifier == otherXamarin.DeviceIdentifier;
+                return this.DeviceIdentifier == otherDeviceInfo.DeviceIdentifier;
             }
             else
             {

src/SharpBrick.PoweredUp.Mobile/XamarinPoweredUpBluetoothAdapter.cs → src/SharpBrick.PoweredUp.Mobile/MobilePoweredUpBluetoothAdapter.cs

@@ -1,133 +1,133 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading;
-using System.Threading.Tasks;
-using Plugin.BLE.Abstractions;
-using Plugin.BLE.Abstractions.Contracts;
-using Plugin.BLE.Abstractions.EventArgs;
-using SharpBrick.PoweredUp.Bluetooth;
-
-namespace SharpBrick.PoweredUp.Mobile
-{
-    public class XamarinPoweredUpBluetoothAdapter : IPoweredUpBluetoothAdapter
-    {
-        private readonly IAdapter _bluetoothAdapter;
-        private readonly INativeDeviceInfoProvider _deviceInfoProvider;
-        private readonly Dictionary<string, IDevice> _discoveredDevices = new Dictionary<string, IDevice>();
-
-        public XamarinPoweredUpBluetoothAdapter(IBluetoothLE bluetooth, INativeDeviceInfoProvider deviceInfoProvider)
-        {
-            _bluetoothAdapter = bluetooth.Adapter;
-            _deviceInfoProvider = deviceInfoProvider;
-        }
-
-        public void Discover(Func<IPoweredUpBluetoothDeviceInfo, Task> discoveryHandler, CancellationToken cancellationToken = default)
-        {
-            _bluetoothAdapter.ScanMode = ScanMode.Balanced;
-
-            _bluetoothAdapter.DeviceDiscovered += ReceivedHandler;
-
-            cancellationToken.Register(async () =>
-            {
-                await _bluetoothAdapter.StopScanningForDevicesAsync().ConfigureAwait(false);
-                _bluetoothAdapter.DeviceDiscovered -= ReceivedHandler;
-            });
-
-            _bluetoothAdapter.StartScanningForDevicesAsync(new Guid[] { new Guid(PoweredUpBluetoothConstants.LegoHubService) }, DeviceFilter, false).ConfigureAwait(false);
-
-            async void ReceivedHandler(object sender, DeviceEventArgs args)
-            {
-                var info = new XamarinBluetoothDeviceInfo();
-
-                var advertisementRecord = args.Device.AdvertisementRecords.FirstOrDefault(x => x.Type == AdvertisementRecordType.ManufacturerSpecificData);
-
-                if (advertisementRecord?.Data?.Length > 0)
-                {
-                    var data = advertisementRecord.Data.ToList();
-                    data.RemoveRange(0, 2);
-                    info.ManufacturerData = data.ToArray();
-
-                    var nativeDeviceInfo = _deviceInfoProvider.GetNativeDeviceInfo(args.Device.NativeDevice);
-
-                    info.Name = args.Device.Name;
-                    info.DeviceIdentifier = nativeDeviceInfo.DeviceIdentifier;
-
-                    AddInternalDevice(args.Device, info);
-                    await discoveryHandler(info).ConfigureAwait(false);
-                }
-            }
-        }
-
-        private void AddInternalDevice(IDevice device, XamarinBluetoothDeviceInfo info)
-        {
-            if (!_discoveredDevices.ContainsKey(info.DeviceIdentifier))
-            {
-                _discoveredDevices.Add(info.DeviceIdentifier, device);
-            }
-            else
-            {
-                _discoveredDevices[info.DeviceIdentifier] = device;
-            }
-        }
-
-        private bool DeviceFilter(IDevice arg)
-        {
-            if (arg == null)
-            {
-                return false;
-            }
-
-            var manufacturerData = arg.AdvertisementRecords.FirstOrDefault(x => x.Type == AdvertisementRecordType.ManufacturerSpecificData);
-
-            if (manufacturerData?.Data == null || manufacturerData.Data.Length < 8)
-            {
-                return false;
-            }
-
-            // https://lego.github.io/lego-ble-wireless-protocol-docs/index.html#advertising
-            // Length and Data Type Name seems to be already trimmed away
-            // Manufacturer ID should be 0x0397 but seems in little endian encoding. I found no notice for this in the documentation except in version number encoding
-
-            return manufacturerData.Data[0] == 0x97 && manufacturerData.Data[1] == 0x03;
-        }
-
-        public async Task<IPoweredUpBluetoothDevice> GetDeviceAsync(IPoweredUpBluetoothDeviceInfo bluetoothDeviceInfo)
-        {
-            var deviceId = (bluetoothDeviceInfo is XamarinBluetoothDeviceInfo local) ? local.DeviceIdentifier : throw new ArgumentException("DeviceInfo not created by adapter", nameof(bluetoothDeviceInfo));
-
-            if (!_discoveredDevices.ContainsKey(deviceId))
-            {
-                CancellationTokenSource cts = new CancellationTokenSource(10000);
-
-                // trigger scan for 10 seconds
-                Discover((deviceInfo) =>
-                {
-                    return Task.Run(() =>
-                    {
-                        cts.Cancel(false);
-                    });
-
-                }, cts.Token);
-
-                // 60 seconds will be ignored here, because the cancelation will happen after 10 seconds
-                await Task.Delay(60000, cts.Token).ContinueWith(task => { });
-
-                if (!_discoveredDevices.ContainsKey(deviceId))
-                {
-                    throw new NotSupportedException("Given bt address does not belong to a discovered device");
-                }
-            }
-
-            return new XamarinPoweredUpBluetoothDevice(_discoveredDevices[deviceId], _bluetoothAdapter);
-        }
-
-        public Task<IPoweredUpBluetoothDeviceInfo> CreateDeviceInfoByKnownStateAsync(object state)
-            => Task.FromResult<IPoweredUpBluetoothDeviceInfo>(state switch
-            {
-                ulong address => new XamarinBluetoothDeviceInfo() { DeviceIdentifier = address.ToString() },
-                string id => new XamarinBluetoothDeviceInfo() { DeviceIdentifier = id },
-                _ => null,
-            });
-    }
-}
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading;
+using System.Threading.Tasks;
+using Plugin.BLE.Abstractions;
+using Plugin.BLE.Abstractions.Contracts;
+using Plugin.BLE.Abstractions.EventArgs;
+using SharpBrick.PoweredUp.Bluetooth;
+
+namespace SharpBrick.PoweredUp.Mobile
+{
+    public class MobilePoweredUpBluetoothAdapter : IPoweredUpBluetoothAdapter
+    {
+        private readonly IAdapter _bluetoothAdapter;
+        private readonly INativeDeviceInfoProvider _deviceInfoProvider;
+        private readonly Dictionary<string, IDevice> _discoveredDevices = new Dictionary<string, IDevice>();
+
+        public MobilePoweredUpBluetoothAdapter(IBluetoothLE bluetooth, INativeDeviceInfoProvider deviceInfoProvider)
+        {
+            _bluetoothAdapter = bluetooth.Adapter;
+            _deviceInfoProvider = deviceInfoProvider;
+        }
+
+        public void Discover(Func<IPoweredUpBluetoothDeviceInfo, Task> discoveryHandler, CancellationToken cancellationToken = default)
+        {
+            _bluetoothAdapter.ScanMode = ScanMode.Balanced;
+
+            _bluetoothAdapter.DeviceDiscovered += ReceivedHandler;
+
+            cancellationToken.Register(async () =>
+            {
+                await _bluetoothAdapter.StopScanningForDevicesAsync().ConfigureAwait(false);
+                _bluetoothAdapter.DeviceDiscovered -= ReceivedHandler;
+            });
+
+            _bluetoothAdapter.StartScanningForDevicesAsync(new Guid[] { new Guid(PoweredUpBluetoothConstants.LegoHubService) }, DeviceFilter, false).ConfigureAwait(false);
+
+            async void ReceivedHandler(object sender, DeviceEventArgs args)
+            {
+                var info = new MobileBluetoothDeviceInfo();
+
+                var advertisementRecord = args.Device.AdvertisementRecords.FirstOrDefault(x => x.Type == AdvertisementRecordType.ManufacturerSpecificData);
+
+                if (advertisementRecord?.Data?.Length > 0)
+                {
+                    var data = advertisementRecord.Data.ToList();
+                    data.RemoveRange(0, 2);
+                    info.ManufacturerData = data.ToArray();
+
+                    var nativeDeviceInfo = _deviceInfoProvider.GetNativeDeviceInfo(args.Device.NativeDevice);
+
+                    info.Name = args.Device.Name;
+                    info.DeviceIdentifier = nativeDeviceInfo.DeviceIdentifier;
+
+                    AddInternalDevice(args.Device, info);
+                    await discoveryHandler(info).ConfigureAwait(false);
+                }
+            }
+        }
+
+        private void AddInternalDevice(IDevice device, MobileBluetoothDeviceInfo info)
+        {
+            if (!_discoveredDevices.ContainsKey(info.DeviceIdentifier))
+            {
+                _discoveredDevices.Add(info.DeviceIdentifier, device);
+            }
+            else
+            {
+                _discoveredDevices[info.DeviceIdentifier] = device;
+            }
+        }
+
+        private bool DeviceFilter(IDevice arg)
+        {
+            if (arg == null)
+            {
+                return false;
+            }
+
+            var manufacturerData = arg.AdvertisementRecords.FirstOrDefault(x => x.Type == AdvertisementRecordType.ManufacturerSpecificData);
+
+            if (manufacturerData?.Data == null || manufacturerData.Data.Length < 8)
+            {
+                return false;
+            }
+
+            // https://lego.github.io/lego-ble-wireless-protocol-docs/index.html#advertising
+            // Length and Data Type Name seems to be already trimmed away
+            // Manufacturer ID should be 0x0397 but seems in little endian encoding. I found no notice for this in the documentation except in version number encoding
+
+            return manufacturerData.Data[0] == 0x97 && manufacturerData.Data[1] == 0x03;
+        }
+
+        public async Task<IPoweredUpBluetoothDevice> GetDeviceAsync(IPoweredUpBluetoothDeviceInfo bluetoothDeviceInfo)
+        {
+            var deviceId = (bluetoothDeviceInfo is MobileBluetoothDeviceInfo local) ? local.DeviceIdentifier : throw new ArgumentException("DeviceInfo not created by adapter", nameof(bluetoothDeviceInfo));
+
+            if (!_discoveredDevices.ContainsKey(deviceId))
+            {
+                CancellationTokenSource cts = new CancellationTokenSource(10000);
+
+                // trigger scan for 10 seconds
+                Discover((deviceInfo) =>
+                {
+                    return Task.Run(() =>
+                    {
+                        cts.Cancel(false);
+                    });
+
+                }, cts.Token);
+
+                // 60 seconds will be ignored here, because the cancelation will happen after 10 seconds
+                await Task.Delay(60000, cts.Token).ContinueWith(task => { });
+
+                if (!_discoveredDevices.ContainsKey(deviceId))
+                {
+                    throw new NotSupportedException("Given bt address does not belong to a discovered device");
+                }
+            }
+
+            return new MobilePoweredUpBluetoothDevice(_discoveredDevices[deviceId], _bluetoothAdapter);
+        }
+
+        public Task<IPoweredUpBluetoothDeviceInfo> CreateDeviceInfoByKnownStateAsync(object state)
+            => Task.FromResult<IPoweredUpBluetoothDeviceInfo>(state switch
+            {
+                ulong address => new MobileBluetoothDeviceInfo() { DeviceIdentifier = address.ToString() },
+                string id => new MobileBluetoothDeviceInfo() { DeviceIdentifier = id },
+                _ => null,
+            });
+    }
+}