Allow direct connection to known device

- Extended PoweredUpHost with Create method. - Add example - Refactored BaseExample to allow alternatives to discovery #52
sharpbrick · Jul 22, 2020 · 97ef072 · 97ef072
1 parent 4326d0e
commit 97ef072
Show file tree

Hide file tree

Showing 6 changed files with 101 additions and 29 deletions.
diff --git a/examples/SharpBrick.PoweredUp.Examples/BaseExample.cs b/examples/SharpBrick.PoweredUp.Examples/BaseExample.cs
@@ -24,31 +24,16 @@ public virtual void Configure(IServiceCollection serviceCollection)
                 .AddPoweredUp();
         }
 
-        public void CreateHostAndDiscover(bool enableTrace)
+        public void InitHostAndDiscover(bool enableTrace)
         {
-            var serviceCollection = new ServiceCollection()
-                // configure your favourite level of logging.
-                .AddLogging(builder =>
-                {
-                    builder
-                        .AddConsole();
-
-                    if (enableTrace)
-                    {
-                        builder.AddFilter("SharpBrick.PoweredUp.Bluetooth.BluetoothKernel", LogLevel.Debug);
-                    }
-                })
-                .AddSingleton<IPoweredUpBluetoothAdapter, WinRTPoweredUpBluetoothAdapter>()
-                ;
-
-            Configure(serviceCollection);
-
-            serviceProvider = serviceCollection.BuildServiceProvider();
+            InitHost(enableTrace);
+            Discover(enableTrace);
+        }
 
+        public virtual void Discover(bool enableTrace)
+        {
             var logger = serviceProvider.GetService<ILoggerFactory>().CreateLogger("Main");
 
-            host = serviceProvider.GetService<PoweredUpHost>();
-
             Hub result = null;
 
             logger.LogInformation("Finding Service");
@@ -83,5 +68,29 @@ public void CreateHostAndDiscover(bool enableTrace)
 
             selectedHub = result;
         }
+
+        public void InitHost(bool enableTrace)
+        {
+            var serviceCollection = new ServiceCollection()
+                // configure your favourite level of logging.
+                .AddLogging(builder =>
+                {
+                    builder
+                        .AddConsole();
+
+                    if (enableTrace)
+                    {
+                        builder.AddFilter("SharpBrick.PoweredUp.Bluetooth.BluetoothKernel", LogLevel.Debug);
+                    }
+                })
+                .AddSingleton<IPoweredUpBluetoothAdapter, WinRTPoweredUpBluetoothAdapter>()
+                ;
+
+            Configure(serviceCollection);
+
+            serviceProvider = serviceCollection.BuildServiceProvider();
+
+            host = serviceProvider.GetService<PoweredUpHost>();
+        }
     }
 }
diff --git a/examples/SharpBrick.PoweredUp.Examples/ExampleBluetoothByKnownAddress.cs b/examples/SharpBrick.PoweredUp.Examples/ExampleBluetoothByKnownAddress.cs
@@ -0,0 +1,42 @@
+using System;
+using System.Threading.Tasks;
+using SharpBrick.PoweredUp;
+
+namespace Example
+{
+    public class ExampleBluetoothByKnownAddress : BaseExample
+    {
+        public const ulong ChangeMe_BluetoothAddress = 158897336311065;
+        public TechnicMediumHub DirectlyConnectedHub { get; private set; }
+
+        // device needs to be switched on!
+        public override void Discover(bool enableTrace)
+        {
+            var hub = host.Create<TechnicMediumHub>(ChangeMe_BluetoothAddress);
+
+            selectedHub = DirectlyConnectedHub = hub;
+
+            hub.ConnectAsync().Wait();
+        }
+
+        public override async Task ExecuteAsync()
+        {
+            using (var technicMediumHub = DirectlyConnectedHub)
+            {
+                await technicMediumHub.RgbLight.SetRgbColorsAsync(0xff, 0x00, 0x00);
+
+                await Task.Delay(2000);
+
+                await technicMediumHub.RgbLight.SetRgbColorsAsync(0x00, 0xff, 0x00);
+
+                await Task.Delay(2000);
+
+                await technicMediumHub.RgbLight.SetRgbColorsAsync(0xff, 0xff, 0x00);
+
+                await Task.Delay(2000);
+
+                await technicMediumHub.SwitchOffAsync();
+            }
+        }
+    }
+}
diff --git a/examples/SharpBrick.PoweredUp.Examples/Program.cs b/examples/SharpBrick.PoweredUp.Examples/Program.cs
@@ -25,9 +25,10 @@ static async Task Main(string[] args)
             //example = new Example.ExampleHubAlert();
             //example = new Example.ExampleTechnicMediumHubTiltSensor();
             //example = new Example.ExampleTechnicMediumHubTiltSensorImpacts();
-            example = new Example.ExampleDynamicDevice();
+            //example = new Example.ExampleDynamicDevice();
+            example = new Example.ExampleBluetoothByKnownAddress();
 
-            example.CreateHostAndDiscover(enableTrace);
+            example.InitHostAndDiscover(enableTrace);
 
             if (example.selectedHub != null)
             {

diff --git a/src/SharpBrick.PoweredUp/Hubs/HubFactory.cs b/src/SharpBrick.PoweredUp/Hubs/HubFactory.cs
@@ -13,13 +13,22 @@ public HubFactory(IServiceProvider serviceProvider)
             _serviceProvider = serviceProvider ?? throw new ArgumentNullException(nameof(serviceProvider));
         }
 
-        public Hub CreateByBluetoothManufacturerData(byte[] manufacturerData, IServiceProvider serviceProvider)
-            => (manufacturerData == null || manufacturerData.Length < 3) ? null : (PoweredUpHubManufacturerData)manufacturerData[1] switch
+        public Hub CreateByBluetoothManufacturerData(byte[] manufacturerData)
+            => (manufacturerData == null || manufacturerData.Length < 3) ? null : Create(GetSystemTypeFromManufacturerData((PoweredUpHubManufacturerData)manufacturerData[1]));
+
+        private SystemType GetSystemTypeFromManufacturerData(PoweredUpHubManufacturerData poweredUpHubManufacturerData)
+            => (SystemType)poweredUpHubManufacturerData;
+
+        public Hub Create(SystemType hubType)
+            => hubType switch
             {
-                PoweredUpHubManufacturerData.TechnicMediumHub => ActivatorUtilities.CreateInstance<TechnicMediumHub>(_serviceProvider, (byte)0x00),
-                _ => throw new NotSupportedException($"Hub with type {(PoweredUpHubManufacturerData)manufacturerData[1]} not yet supported."),
+                SystemType.LegoTechnic_MediumHub => ActivatorUtilities.CreateInstance<TechnicMediumHub>(_serviceProvider, (byte)0x00),
+                _ => throw new NotSupportedException($"Hub with type {hubType} not yet supported."),
             };
 
+        public THub Create<THub>() where THub : class
+            => Create(GetSystemTypeFromType(typeof(THub))) as THub;
+
         public static SystemType GetSystemTypeFromType(Type type)
             => type.Name switch
             {

diff --git a/src/SharpBrick.PoweredUp/Hubs/IHubFactory.cs b/src/SharpBrick.PoweredUp/Hubs/IHubFactory.cs
@@ -4,6 +4,7 @@ namespace SharpBrick.PoweredUp.Hubs
 {
     public interface IHubFactory
     {
-        Hub CreateByBluetoothManufacturerData(byte[] manufacturerData, IServiceProvider serviceProvider);
+        Hub CreateByBluetoothManufacturerData(byte[] manufacturerData);
+        THub Create<THub>() where THub : class;
     }
 }
diff --git a/src/SharpBrick.PoweredUp/PoweredUpHost.cs b/src/SharpBrick.PoweredUp/PoweredUpHost.cs
@@ -46,7 +46,7 @@ public void Discover(Func<Hub, Task> onDiscovery, CancellationToken token = defa
             {
                 if (!_hubs.ContainsKey(deviceInfo.BluetoothAddress))
                 {
-                    var hub = _hubFactory.CreateByBluetoothManufacturerData(deviceInfo.ManufacturerData, ServiceProvider);
+                    var hub = _hubFactory.CreateByBluetoothManufacturerData(deviceInfo.ManufacturerData);
                     hub.ConnectWithBluetoothAdapter(_bluetoothAdapter, deviceInfo.BluetoothAddress);
 
                     _hubs.TryAdd(deviceInfo.BluetoothAddress, hub);
@@ -55,5 +55,15 @@ public void Discover(Func<Hub, Task> onDiscovery, CancellationToken token = defa
                 }
             }, token);
         }
+
+        public THub Create<THub>(ulong bluetoothAddress) where THub : Hub
+        {
+            var hub = _hubFactory.Create<THub>();
+            hub.ConnectWithBluetoothAdapter(_bluetoothAdapter, bluetoothAddress);
+
+            _hubs.TryAdd(bluetoothAddress, hub);
+
+            return hub;
+        }
     }
 }