Merge branch 'develop' into #89-OpenReadOnly

MelbourneDeveloper · Aug 2, 2019 · 151fa3e · 151fa3e
2 parents f27adbb + df0c58f
commit 151fa3e
Show file tree

Hide file tree

Showing 7 changed files with 12 additions and 4 deletions.
diff --git a/src/Device.Net/Messages.cs b/src/Device.Net/Messages.cs
@@ -2,6 +2,8 @@
 {
     public static class Messages
     {
+        public const string ObsoleteMessagePlatformSpecificUsbDevice = "Platform specific USB Devices are being deprecated. Please construct a UsbDevice and pass the UsbInterfaceManager in to the constructor. This is to maintain the dependency injection pattern.";
+
         #region Device Initialization
         public const string ErrorMessageNotInitialized = "The device has not been initialized.";
         public const string ErrorMessageCouldntIntializeDevice = "Couldn't initialize device";

diff --git a/src/Usb.Net.Android/AndroidUsbDevice.cs b/src/Usb.Net.Android/AndroidUsbDevice.cs
@@ -1,7 +1,9 @@
 using Device.Net;
+using System;
 
 namespace Usb.Net.Android
 {
+    [Obsolete(Messages.ObsoleteMessagePlatformSpecificUsbDevice)]
     public class AndroidUsbDevice : UsbDevice
     {
         public AndroidUsbDevice(AndroidUsbInterfaceManager androidUsbInterfaceManager, ILogger logger, ITracer tracer) : base(androidUsbInterfaceManager, logger, tracer)

diff --git a/src/Usb.Net.Android/AndroidUsbDeviceFactory.cs b/src/Usb.Net.Android/AndroidUsbDeviceFactory.cs
@@ -65,7 +65,7 @@ public IDevice GetDevice(ConnectedDeviceDefinition deviceDefinition)
                 throw new Exception($"The device Id '{deviceDefinition.DeviceId}' is not a valid integer");
             }
 
-            return new AndroidUsbDevice(new AndroidUsbInterfaceManager(UsbManager, Context, deviceId, Logger, Tracer, ReadBufferSize, WriteBufferSize), Logger, Tracer);
+            return new UsbDevice(new AndroidUsbInterfaceManager(UsbManager, Context, deviceId, Logger, Tracer, ReadBufferSize, WriteBufferSize), Logger, Tracer);
         }
         #endregion
 

diff --git a/src/Usb.Net.UWP/UWPUsbDevice.cs b/src/Usb.Net.UWP/UWPUsbDevice.cs
@@ -1,7 +1,9 @@
-using System;
+using Device.Net;
+using System;
 
 namespace Usb.Net.UWP
 {
+    [Obsolete(Messages.ObsoleteMessagePlatformSpecificUsbDevice)]
     public class UWPUsbDevice : UsbDevice
     {
         public UWPUsbDevice(UWPUsbInterfaceManager usbDeviceHandler) : base(usbDeviceHandler, usbDeviceHandler?.Logger, usbDeviceHandler?.Tracer)

diff --git a/src/Usb.Net.UWP/UWPUsbDeviceFactory.cs b/src/Usb.Net.UWP/UWPUsbDeviceFactory.cs
@@ -39,7 +39,7 @@ public IDevice GetDevice(ConnectedDeviceDefinition deviceDefinition)
         {
             if (deviceDefinition == null) throw new ArgumentNullException(nameof(deviceDefinition));
 
-            return deviceDefinition.DeviceType == DeviceType.Hid ? null : new UWPUsbDevice(new UWPUsbInterfaceManager(deviceDefinition, Logger, Tracer, ReadBufferSize, WriteBufferSize));
+            return deviceDefinition.DeviceType == DeviceType.Hid ? null : new UsbDevice(new UWPUsbInterfaceManager(deviceDefinition, Logger, Tracer, ReadBufferSize, WriteBufferSize), Logger, Tracer);
         }
         #endregion
 

diff --git a/src/Usb.Net/Windows/WindowsUsbDevice.cs b/src/Usb.Net/Windows/WindowsUsbDevice.cs
@@ -1,7 +1,9 @@
 using Device.Net;
+using System;
 
 namespace Usb.Net.Windows
 {
+    [Obsolete(Messages.ObsoleteMessagePlatformSpecificUsbDevice)]
     public class WindowsUsbDevice : UsbDevice
     {
         public WindowsUsbDevice(string deviceId, ILogger logger, ITracer tracer, ushort? readBufferSize, ushort? writeBufferSize) : base(new WindowsUsbInterfaceManager(deviceId, logger, tracer, readBufferSize, writeBufferSize), logger, tracer)

diff --git a/src/Usb.Net/Windows/WindowsUsbDeviceFactory.cs b/src/Usb.Net/Windows/WindowsUsbDeviceFactory.cs
@@ -34,7 +34,7 @@ public IDevice GetDevice(ConnectedDeviceDefinition deviceDefinition)
         {
             if (deviceDefinition == null) throw new ArgumentNullException(nameof(deviceDefinition));
 
-            return deviceDefinition.DeviceType != DeviceType ? null : new WindowsUsbDevice(deviceDefinition.DeviceId, Logger, Tracer, ReadBufferSize, WriteBufferSize);
+            return deviceDefinition.DeviceType != DeviceType ? null : new UsbDevice(new WindowsUsbInterfaceManager(deviceDefinition.DeviceId, Logger, Tracer, ReadBufferSize, WriteBufferSize), Logger, Tracer);
         }
         #endregion