From 8916f74ae6c3363c745f8859ccc4c8b8608d464b Mon Sep 17 00:00:00 2001
From: David Shalaby <dave@taptrack.com>
Date: Sat, 1 Jul 2017 18:34:38 -0400
Subject: [PATCH] Changes to BLE Blugiga library to allow kisok/keyboard wedge
 mode.  Slightly better handling of the Bluegiga COM port connection.

---
 Example/MainWindow.xaml                       |   5 +-
 Example/MainWindow.xaml.cs                    |  68 +++--
 Example/Simple Styles.xaml                    |   6 +-
 Example/Tappy Tcmp Demo.csproj                |   6 +-
 .../System/ConfigureKioskKeyboardWedgeMode.cs |  27 ++
 Tcmp-SDK/Tcmp/CommandFamilies/System/Ping.cs  |   2 +-
 .../Tcmp/Communication/Bluetooth/BGLib.cs     |  31 +-
 .../Bluetooth/BluetoothConnection.cs          | 271 +++++++++++-------
 Tcmp-SDK/Tcmp/Communication/Connection.cs     |  11 +-
 Tcmp-SDK/Tcmp/Communication/TappyReader.cs    | 208 +++++++++++---
 Tcmp-SDK/Tcmp/Communication/UsbConnection.cs  |  37 ++-
 11 files changed, 493 insertions(+), 179 deletions(-)
 create mode 100644 Tcmp-SDK/Tcmp/CommandFamilies/System/ConfigureKioskKeyboardWedgeMode.cs

diff --git a/Example/MainWindow.xaml b/Example/MainWindow.xaml
index a420d82..0c62e9b 100644
--- a/Example/MainWindow.xaml
+++ b/Example/MainWindow.xaml
@@ -9,7 +9,7 @@
         xmlns:gif="http://wpfanimatedgif.codeplex.com"
         mc:Ignorable="d"
         WindowStartupLocation="CenterScreen"
-        Title="Tappy Demo 2.2" Height="650" Width="800" Foreground="{x:Null}" Background="{StaticResource LightBackground}">
+        Title="Tappy Demo 2.3" Height="650" Width="800" Foreground="{x:Null}" Background="{StaticResource LightBackground}">
     <Grid Background="{StaticResource LightBackground}">
         <Grid.RowDefinitions>
             <RowDefinition Height="50"/>
@@ -21,7 +21,8 @@
         </WrapPanel>
         <WrapPanel Grid.Row="0" HorizontalAlignment="Right" >
             <Button Margin="10" Height="15" Padding="0" Background="White" BorderBrush="{x:Null}" Style="{StaticResource StopButton}" Click="StopButton_Click"/>
-            <Button Name="autoDetectButton" Margin="10" Height="25" Padding="0" Background="{x:Null}" BorderBrush="{x:Null}" Style="{StaticResource USBButton}" Click="AutoDetectButton_Click"/>
+            <Button Name="autoDetectButton" Margin="10" Height="25" Padding="0" Background="{x:Null}"
+					BorderBrush="{x:Null}" Style="{StaticResource USBButton}" Click="AutoDetectButton_Click"/>
             <Button Margin="10" Height="25" Style="{StaticResource DisconnectButton}" Click="disconnectButton_Click"  Content="Disconnect"/>
             <Button Margin="10" Height="25" Padding="0" Background="{x:Null}" BorderBrush="{x:Null}" Style="{StaticResource SettingsButton}" Click="SettingsButton_Click"/>
         </WrapPanel>
diff --git a/Example/MainWindow.xaml.cs b/Example/MainWindow.xaml.cs
index ecce1b5..8bbaf5d 100644
--- a/Example/MainWindow.xaml.cs
+++ b/Example/MainWindow.xaml.cs
@@ -464,37 +464,54 @@ private void AutoDetectButton_Click(object sender, RoutedEventArgs e)
                 else if (window.Protocol == CommunicationProtocol.Bluetooth)
                 {
                     batteryTab.Visibility = Visibility.Visible;
-                    if (GetBluegigaDevice() == null)
-                    {
-                        ShowFailStatus("Please insert BLED112 dongle");
-                        return;
-                    }
-                }
+					if (GetBluegigaDevice() == null)
+					{
+						ShowFailStatus("Please insert BLED112 dongle");
+						return;
+					}
 
+                }
+				
                 tappy.SwitchProtocol(window.Protocol);
 
-                ShowPendingStatus("Searching for a Tappy");
+					ShowPendingStatus("Searching for a Tappy");
 
                 Task.Run(() =>
                 {
-                    if (tappy.AutoDetect())
-                    {
-                        ShowSuccessStatus($"Connected to {tappy.DeviceName}");
-                        if (window.Protocol == CommunicationProtocol.Bluetooth)
-                        {
-                            try
-                            {
-                                Command cmd = new EnableDataThrottling(10, 5);
-                                tappy.SendCommand(cmd);
-                            }
-                            catch
-                            {
-
-                            }
-                        }
-                    }
-                    else
-                        ShowFailStatus("No Tappy found");
+					if (tappy.AutoDetect())
+					{
+						ShowSuccessStatus($"Connected to {tappy.DeviceName}");
+						if (window.Protocol == CommunicationProtocol.Bluetooth)
+						{
+							try
+							{
+								Command cmd = new EnableDataThrottling(10, 5);
+								tappy.SendCommand(cmd);
+							}
+							catch
+							{
+
+							}
+						}
+					}
+					else
+					{
+						ShowFailStatus("No Tappy found");
+						if (window.Protocol == CommunicationProtocol.Bluetooth)
+						{
+							try
+							{
+								tappy.DisconnectBlueGiga();
+							}
+							catch 
+							{								
+								return;
+
+							}
+
+						}
+				
+					}
                 });
             }
         }
@@ -709,6 +726,7 @@ private void disconnectButton_Click(object sender, RoutedEventArgs e)
             try
             {
                 tappy.Disconnect();
+				tappy.DisconnectBlueGiga();
                 ShowSuccessStatus("Disconnect was successful");
             }
             catch
diff --git a/Example/Simple Styles.xaml b/Example/Simple Styles.xaml
index eb7fbd7..283f362 100644
--- a/Example/Simple Styles.xaml	
+++ b/Example/Simple Styles.xaml	
@@ -1,4 +1,8 @@
-<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:d="http://schemas.microsoft.com/expression/interactivedesigner/2006" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" mc:Ignorable="d">
+<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" 
+					xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" 
+					xmlns:d="http://schemas.microsoft.com/expression/interactivedesigner/2006" 
+					xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
+					mc:Ignorable="d">
     
     <!-- SimpleStyles.XAML defines a set of control styles which are simplified starting points for creating your own controls -->
     
diff --git a/Example/Tappy Tcmp Demo.csproj b/Example/Tappy Tcmp Demo.csproj
index 41f0403..8961978 100644
--- a/Example/Tappy Tcmp Demo.csproj	
+++ b/Example/Tappy Tcmp Demo.csproj	
@@ -8,7 +8,7 @@
     <OutputType>WinExe</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>TapTrack.Demo</RootNamespace>
-    <AssemblyName>Tappy Demo 2.2</AssemblyName>
+    <AssemblyName>Tappy Demo 2.3</AssemblyName>
     <TargetFrameworkVersion>v4.5.2</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
@@ -49,7 +49,7 @@
     <DefineConstants>DEBUG;TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
-    <DocumentationFile>bin\Debug\Tappy Demo 2.2.xml</DocumentationFile>
+    <DocumentationFile>bin\Debug\Tappy Demo 2.3.xml</DocumentationFile>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <PlatformTarget>AnyCPU</PlatformTarget>
@@ -59,7 +59,7 @@
     <DefineConstants>TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
-    <DocumentationFile>bin\Release\Tappy Demo 2.2.xml</DocumentationFile>
+    <DocumentationFile>bin\Release\Tappy Demo 2.3.xml</DocumentationFile>
   </PropertyGroup>
   <PropertyGroup>
     <ManifestCertificateThumbprint>DA55EDA3D657C041EF308F9D8CDF1B5A4950F2E4</ManifestCertificateThumbprint>
diff --git a/Tcmp-SDK/Tcmp/CommandFamilies/System/ConfigureKioskKeyboardWedgeMode.cs b/Tcmp-SDK/Tcmp/CommandFamilies/System/ConfigureKioskKeyboardWedgeMode.cs
new file mode 100644
index 0000000..caa551c
--- /dev/null
+++ b/Tcmp-SDK/Tcmp/CommandFamilies/System/ConfigureKioskKeyboardWedgeMode.cs
@@ -0,0 +1,27 @@
+namespace TapTrack.Tcmp.CommandFamilies.System
+{
+	/// <summary>
+	/// Command to configure thee Tappy when in keyboard wedge/ kiosk mode
+	/// </summary>
+	public class ConfigureKioskKeyboardWedgeMode : SystemCommand
+	{
+		public const byte commandCode = 0x06;
+
+		public override byte CommandCode
+		{
+			get
+			{
+				return commandCode;
+			}
+		}
+		public ConfigureKioskKeyboardWedgeMode(byte dualTagDetection, byte ndefReading, byte  hearbeatPeriod, byte enableScanErrMsgs)
+		{
+			this.parameters.Add(dualTagDetection);
+			this.parameters.Add(ndefReading);
+			this.parameters.Add(hearbeatPeriod);
+			this.parameters.Add(enableScanErrMsgs);
+
+		}
+
+	}
+}
diff --git a/Tcmp-SDK/Tcmp/CommandFamilies/System/Ping.cs b/Tcmp-SDK/Tcmp/CommandFamilies/System/Ping.cs
index cffeeb4..043ea88 100644
--- a/Tcmp-SDK/Tcmp/CommandFamilies/System/Ping.cs
+++ b/Tcmp-SDK/Tcmp/CommandFamilies/System/Ping.cs
@@ -5,7 +5,7 @@
     /// </summary>
     public class Ping : SystemCommand
     {
-        private const byte commandCode = 0xFD;
+        public const byte commandCode = 0xFD;
 
         public override byte CommandCode
         {
diff --git a/Tcmp-SDK/Tcmp/Communication/Bluetooth/BGLib.cs b/Tcmp-SDK/Tcmp/Communication/Bluetooth/BGLib.cs
index a83a952..df60698 100644
--- a/Tcmp-SDK/Tcmp/Communication/Bluetooth/BGLib.cs
+++ b/Tcmp-SDK/Tcmp/Communication/Bluetooth/BGLib.cs
@@ -3793,10 +3793,33 @@ BGAPI packet structure (as of 2012-11-07):
 
         public UInt16 SendCommand(System.IO.Ports.SerialPort port, Byte[] cmd)
         {
-            SetBusy(true);
-            if (bgapiPacketMode) port.Write(new Byte[] { (Byte)cmd.Length }, 0, 1);
-            port.Write(cmd, 0, cmd.Length);
-            return 0; // no error handling yet
+			if (port == null) //needed now that port is nullable (better than having it set to a random invalid port name on instantiation) 
+			{
+				return 1;
+			}
+			else
+			{
+				SetBusy(true);
+				if (bgapiPacketMode) port.Write(new Byte[] { (Byte)cmd.Length }, 0, 1);
+				if (port != null)
+				{
+					try
+					{
+						port.Write(cmd, 0, cmd.Length);
+						return 0; // no error handling yet
+					}
+					catch
+					{
+						return 1;
+					}
+
+				}
+				else
+				{
+					return 1;
+				}
+			}
+            
         }
 
     }
diff --git a/Tcmp-SDK/Tcmp/Communication/Bluetooth/BluetoothConnection.cs b/Tcmp-SDK/Tcmp/Communication/Bluetooth/BluetoothConnection.cs
index cc1cd34..7cbfa9f 100644
--- a/Tcmp-SDK/Tcmp/Communication/Bluetooth/BluetoothConnection.cs
+++ b/Tcmp-SDK/Tcmp/Communication/Bluetooth/BluetoothConnection.cs
@@ -33,17 +33,11 @@ private enum Handle : ushort
         private List<BluetoothDevice> discoveredDevices;
         private bool isConnected;
         private object bufferLock;
+		private Bluegiga.BLE.Events.Connection.DisconnectedEventHandler disconnectCallback;
 
         public BluetoothConnection()
         {
-            port = new SerialPort();
-            port.DataReceived += new SerialDataReceivedEventHandler(DataReceivedHandler);
-            port.Handshake = Handshake.RequestToSend;
-            port.BaudRate = 115200;
-            port.DataBits = 8;
-            port.StopBits = StopBits.One;
-            port.Parity = Parity.None;
-
+			port = null; //if a new SerialPort is instantiated here for some reason the portName is always "COM1" even if that's not a valid port on the PC so we make this nullable instead.	
             bluetooth = new Bluegiga.BGLib();
 
             discoveredDevices = new List<BluetoothDevice>();
@@ -56,9 +50,30 @@ public BluetoothConnection()
 
             bluetooth.BLEEventATTClientAttributeValue += DataReceivedFromTappy;
             bluetooth.BLEEventConnectionDisconnected += Bluetooth_BLEEventConnectionDisconnected;
-        }
 
-        private void DataReceivedHandler(object sender, SerialDataReceivedEventArgs e)
+		}
+
+		public BluetoothConnection(Bluegiga.BLE.Events.Connection.DisconnectedEventHandler callback)
+		{
+			port = null; //if a new SerialPort is instantiated here for some reason the portName is always "COM1" even if that's not a valid port on the PC so we make this nullable instead.	
+			bluetooth = new Bluegiga.BGLib();
+
+			discoveredDevices = new List<BluetoothDevice>();
+			tappyBuffer = new List<byte>();
+			isConnected = false;
+
+			bufferLock = new object();
+
+			// Bluegiga Events
+
+			bluetooth.BLEEventATTClientAttributeValue += DataReceivedFromTappy;
+			bluetooth.BLEEventConnectionDisconnected += Bluetooth_BLEEventConnectionDisconnected;
+			bluetooth.BLEEventConnectionDisconnected += callback;
+		   disconnectCallback += callback;
+
+		}
+
+		private void DataReceivedHandler(object sender, SerialDataReceivedEventArgs e)
         {
             if (!port.IsOpen)
                 return;
@@ -88,9 +103,18 @@ private void Bluetooth_BLEEventConnectionDisconnected(object sender, Disconnecte
         {
             isConnected = false;
             Debug.WriteLine($"Disconnected: {e.reason}");
-        }
+		    if(disconnectCallback != null)
+				disconnectCallback(sender, e);
+
+		}
+
+		private void nullDisconnectEventHandler(object sender, DisconnectedEventArgs e)
+		{
+		}
 
-        private string Search(string searchLocation)
+
+
+		private string Search(string searchLocation)
         {
             ManagementObjectCollection comPortDevices;
             ManagementObjectSearcher searcher = new ManagementObjectSearcher($"Select * From {searchLocation}");
@@ -119,28 +143,49 @@ private string GetBluegigaDevice()
 
         public bool ConnectToBluegiga()
         {
-            string portName = GetBluegigaDevice();
-
-            if (portName == null)
-                return false;
-
-            try
-            {
-                if (port.IsOpen)
-                    port.Close();
-                port.PortName = portName;
-                port.Open();
-                return true;
-            }
-            catch
-            {
-                return false;
-            }
-        }
+			if (getBlueGigaStatus())
+				return true;
+
+			string portName = GetBluegigaDevice();
+
+			if (portName == null)
+				return false;
+
+			try
+			{
+				if (port == null) // no port assigned yet
+				{
+					port = new SerialPort();
+					port.PortName = portName;
+					port.DataReceived += new SerialDataReceivedEventHandler(DataReceivedHandler);
+					port.Handshake = Handshake.RequestToSend;
+					port.BaudRate = 115200;
+					port.DataBits = 8;
+					port.StopBits = StopBits.One;
+					port.Parity = Parity.None;
+					port.Open();
+					return true;
+				}
+				else if (port.IsOpen)
+				{
+					return true;  //this method should not be switching ports, probably best to creat a separate method for that. 
+				}
+				else //port is assigned but closed
+				{
+					port.Open();
+					return true;
+				}
+			}
+			catch (Exception e)
+			{
+				return false;
+			}
+
+		}
 
         public override bool Connect(string deviceName)
         {
-            if (!port.IsOpen)
+           if (!port.IsOpen)
             {
                 if (!ConnectToBluegiga())
                     return false;
@@ -195,94 +240,105 @@ public override bool Connect(string deviceName)
             return connectionEst;
         }
 
-        public bool DisconnectBluegiga()
+		public override void DisconnectBlueGiga()
+		{
+			try
+			{
+				port?.Close();
+				port = null;
+			}
+			catch (Exception e)
+			{
+				return;
+			}
+		}
+
+		public override void Disconnect()
         {
-            try
-            {
-                port.Close();
-                return true;
-            }
-            catch
-            {
-                return false;
-            }
-        }
+			if (device?.ConnectionHandle != null && (port?.IsOpen) != null)
+				bluetooth.SendCommand(port, bluetooth.BLECommandConnectionDisconnect((byte)device.ConnectionHandle));			
+		}
 
-        public override void Disconnect()
-        {
-            if (device?.ConnectionHandle != null && port.IsOpen)
-                bluetooth.SendCommand(port, bluetooth.BLECommandConnectionDisconnect((byte)device.ConnectionHandle));
-            DisconnectBluegiga();
-        }
+		public override string[] GetAvailableDevices()
+		{
+			return GetAvailableDevices(3000);
+		}
 
-        public override string[] GetAvailableDevices()
+		public override string[] GetAvailableDevices(int scanTime)
         {
-            return GetAvailableDevices(1500);
-        }
 
-        public string[] GetAvailableDevices(int scanTime)
-        {
-            List<string> names = new List<string>();
-            bool commandStarted = false;
-            AutoResetEvent resp = new AutoResetEvent(false);
-            discoveredDevices.Clear();
+			return GetAvailableDevices(scanTime, true);
 
-            if (!port.IsOpen)
-            {
-                if (!ConnectToBluegiga())
-                    return names.ToArray();
-            }
+		}
 
-            DiscoverEventHandler discoverResp = delegate (object sender, DiscoverEventArgs e)
-            {
-                if (e.result == 0)
-                    commandStarted = true;
-                resp.Set();
-            };
+		public override string[] GetAvailableDevices(int scanTime, bool detectBlueGiga)
+		{
+			List<string> names = new List<string>();
+			bool commandStarted = false;
+			AutoResetEvent resp = new AutoResetEvent(false);
+			discoveredDevices.Clear();
 
-            ScanResponseEventHandler deviceFound = delegate (object sender, ScanResponseEventArgs e)
-            {
-                if (e.data.Length < 8)
-                    return;
+			if (detectBlueGiga)
+			{
+				if (/*port == null ||*/ !getBlueGigaStatus()) //only try to find a BlueGiga dongle if one is not already assigned. 
+				{
+					if (!ConnectToBluegiga())
+						return names.ToArray();
+				}
+			}
+	
 
-                string name = Encoding.UTF8.GetString(e.data, e.data.Length - 8, 8);
+			DiscoverEventHandler discoverResp = delegate (object sender, DiscoverEventArgs e)
+			{
+				if (e.result == 0)
+					commandStarted = true;
+				resp.Set();
+			};
 
-                if (!name.Contains("TAPPY"))
-                    return;
+			ScanResponseEventHandler deviceFound = delegate (object sender, ScanResponseEventArgs e)
+			{
+				if (e.data.Length < 8)
+					return;
 
-                foreach (BluetoothDevice device in discoveredDevices)
-                {
-                    if (device.Name.Equals(name))
-                        return;
-                }
+				string name = Encoding.UTF8.GetString(e.data, e.data.Length - 8, 8);
 
-                discoveredDevices.Add(new BluetoothDevice(e.sender, e.bond, e.rssi, name));
-            };
+				if (!name.Contains("TAPPY"))
+					return;
 
-            bluetooth.BLEResponseGAPDiscover += discoverResp;
+				foreach (BluetoothDevice device in discoveredDevices)
+				{
+					if (device.Name.Equals(name))
+						return;
+				}
 
-            bluetooth.SendCommand(port, bluetooth.BLECommandGAPDiscover(2));
+				discoveredDevices.Add(new BluetoothDevice(e.sender, e.bond, e.rssi, name));
+			};
 
-            resp.WaitOne(200);
+			bluetooth.BLEResponseGAPDiscover += discoverResp;
 
-            bluetooth.BLEEventGAPScanResponse += deviceFound;
-            bluetooth.BLEResponseGAPDiscover -= discoverResp;
+			bluetooth.SendCommand(port, bluetooth.BLECommandGAPDiscover(2));
 
-            if (!commandStarted)
-                return names.ToArray();
+			resp.WaitOne(200);
 
-            Thread.Sleep(scanTime);
-            bluetooth.SendCommand(port, bluetooth.BLECommandGAPEndProcedure());
+			bluetooth.BLEEventGAPScanResponse += deviceFound;
+			bluetooth.BLEResponseGAPDiscover -= discoverResp;
 
-            bluetooth.BLEEventGAPScanResponse -= deviceFound;
+			if (!commandStarted)
+				return names.ToArray();
 
-            foreach (BluetoothDevice device in this.discoveredDevices)
-                names.Add(device.Name);
+			Thread.Sleep(scanTime);
+			bluetooth.SendCommand(port, bluetooth.BLECommandGAPEndProcedure());
 
-            return names.ToArray();
-        }
+			bluetooth.BLEEventGAPScanResponse -= deviceFound;
 
-        public override bool IsOpen()
+			foreach (BluetoothDevice device in this.discoveredDevices)
+				names.Add(device.Name);
+
+			return names.ToArray();
+		}
+
+
+		public override bool IsOpen()
         {
             if (!port.IsOpen)
                 return false;
@@ -357,9 +413,28 @@ public override void Send(byte[] data)
             }
         }
 
+		public override bool getConnectionStatus()
+		{
+			return isConnected;
+		}
+
+		public override  bool getBlueGigaStatus()
+		{
+			if (port == null)
+				return false;
+			else
+				return true;										
+
+		}
+
+		public override void setDisconnectCallback(Bluegiga.BLE.Events.Connection.DisconnectedEventHandler callback)
+		{
+			disconnectCallback += callback;	
+		}
+
         public override void Flush()
         {
-            if (port.IsOpen)
+            if (port?.IsOpen != null)
             {
                 port.DiscardInBuffer();
                 port.DiscardOutBuffer();
diff --git a/Tcmp-SDK/Tcmp/Communication/Connection.cs b/Tcmp-SDK/Tcmp/Communication/Connection.cs
index a91f461..4074b91 100644
--- a/Tcmp-SDK/Tcmp/Communication/Connection.cs
+++ b/Tcmp-SDK/Tcmp/Communication/Connection.cs
@@ -21,8 +21,15 @@ protected virtual void OnDataReceived(EventArgs e)
         public abstract void Send(byte[] data);
         public abstract int Read(List<byte> data);
         public abstract string[] GetAvailableDevices();
-        public abstract bool IsOpen();
+		public abstract string[] GetAvailableDevices(int timeout);
+		public abstract string[] GetAvailableDevices(int timeou, bool scanForBlueGiga);
+		public abstract bool IsOpen();
         public abstract void Flush();
         public abstract void Dispose();
-    }
+		public abstract bool getConnectionStatus();
+		public abstract bool getBlueGigaStatus();
+		public abstract void setDisconnectCallback(Bluegiga.BLE.Events.Connection.DisconnectedEventHandler disconnectCallback);
+		public abstract void DisconnectBlueGiga();
+
+	}
 }
diff --git a/Tcmp-SDK/Tcmp/Communication/TappyReader.cs b/Tcmp-SDK/Tcmp/Communication/TappyReader.cs
index 85e7ee0..789c96b 100644
--- a/Tcmp-SDK/Tcmp/Communication/TappyReader.cs
+++ b/Tcmp-SDK/Tcmp/Communication/TappyReader.cs
@@ -140,12 +140,30 @@ public TappyReader(CommunicationProtocol protocol)
             conn.DataReceived += new EventHandler(DataReceivedHandler);
             DeviceName = null;
         }
-
-        private void DataReceivedHandler(object sender, EventArgs e)
+		public TappyReader(CommunicationProtocol protocol, Bluegiga.BLE.Events.Connection.DisconnectedEventHandler disconnectCallback)
+		{
+			if (protocol == CommunicationProtocol.Usb)
+			{
+				conn = new UsbConnection();
+			}
+			else if (protocol == CommunicationProtocol.Bluetooth)
+			{
+				conn = new BluetoothConnection(disconnectCallback);
+			}
+
+			buffer = new List<byte>();
+			conn.DataReceived += new EventHandler(DataReceivedHandler);
+			DeviceName = null;
+			
+		}
+
+		private void DataReceivedHandler(object sender, EventArgs e)
         {
             Debug.WriteLine("Data is being recieve");
-            if (!conn.IsOpen())
-                responseCallback(null, new HardwareException("Connection to device is not open"));
+			if (!conn.IsOpen() && responseCallback != null)
+				responseCallback(null, new HardwareException("Connection to device is not open"));
+			else
+				Console.WriteLine("Bluegiga dongle receiving but no responseCallback assigned");
 
             Debug.WriteLine($"     Before: {BitConverter.ToString(buffer.ToArray())}");
 
@@ -238,11 +256,50 @@ public void FlushBuffer()
             this.conn.Flush();
         }
 
-        /// <summary>
-        /// Connect to the first Tappy device the driver finds
-        /// </summary>
-        /// <returns>True if connection to a Tappy device was successful, false otherwise</returns>
-        public bool AutoDetect()
+		/// <summary>
+		/// Connect to a Tappy device by the device name (TAPPY123)
+		/// </summary>
+		/// <returns>True if connection to a Tappy device was successful, false otherwise</returns>
+
+		public bool ConnectByName(string tappyName)
+		{
+			foreach (string name in conn.GetAvailableDevices())
+			{
+				if (name.ToUpper() == tappyName.ToUpper())
+				{
+					return Connect(tappyName);
+				}
+			}
+			return false;
+
+		}
+
+
+		/// <summary>
+		/// Connect to a Tappy device by the device name (TAPPY123) when it is in kiosk/keyboard wedge mode
+		/// </summary>
+		/// <returns>True if connection to a Tappy device was successful, false otherwise</returns>
+
+		public bool ConnectKioskKeyboardWedgeByName(string tappyName)
+		{
+			foreach (string name in conn.GetAvailableDevices())
+			{
+				if (name.ToUpper() == tappyName.ToUpper())
+				{
+					return ConnectKioskKeyboardWedge(tappyName);
+				}
+			}
+			return false;
+
+		}
+
+
+
+		/// <summary>
+		/// Connect to the first Tappy device the driver finds
+		/// </summary>
+		/// <returns>True if connection to a Tappy device was successful, false otherwise</returns>
+		public bool AutoDetect()
         {
             bool success;
             foreach (string name in conn.GetAvailableDevices())
@@ -255,11 +312,26 @@ public bool AutoDetect()
             return false;
         }
 
-        /// <summary>
-        /// Switch between USB or Bluetooth modes
-        /// </summary>
-        /// <param name="protocol"></param>
-        public void SwitchProtocol(CommunicationProtocol protocol)
+		/// <summary>
+		/// Return a list of strings representing TappyBLEs nearby
+		/// </summary>
+		/// <returns>A list of strings representing TappyBLE device names</returns>
+		///  /// <param name="timeout">Amount of time to scan for in ms</param>		
+		public string[] FindNearbyTappyBLEs(int timeout)
+		{
+			if (conn.getBlueGigaStatus())
+				return conn.GetAvailableDevices(timeout,false);
+			else
+				return conn.GetAvailableDevices(timeout, true);
+
+			
+		}
+
+		/// <summary>
+		/// Switch between USB or Bluetooth modes
+		/// </summary>
+		/// <param name="protocol"></param>
+		public void SwitchProtocol(CommunicationProtocol protocol)
         {
             conn?.Disconnect();
 
@@ -280,33 +352,55 @@ public void SwitchProtocol(CommunicationProtocol protocol)
         /// <returns></returns>
         public bool Connect(string deviceName)
         {
-            Command cmd = new Ping();
-            AutoResetEvent receivedResp = new AutoResetEvent(false);
-            bool success = false;
-
-            if (!conn.Connect(deviceName))
-                return false;
-
-            Callback resp = (ResponseFrame frame, Exception e) =>
-            {
-                if (TcmpFrame.IsValidFrame(frame))
-                    success = true;
-                receivedResp.Set();
-            };
-
-            SendCommand(cmd, resp);
-            receivedResp.WaitOne(250);
-
-            if (success)
-                DeviceName = deviceName;
-
-            return success;
+			return ConnectWithTimeout(deviceName, 250);
         }
 
-        /// <summary>
-        /// Disconnect from the current reader
-        /// </summary>
-        public void Disconnect()
+		/// <summary>
+		/// Connect to a given reader or port when it is in kiosk/keyboard wedge mode where it will send heartbeat pings
+		/// </summary>
+		/// <param name="deviceName"></param>
+		/// <returns></returns>
+		public bool ConnectKioskKeyboardWedge(string deviceName)
+		{
+			return ConnectWithTimeout(deviceName,12000);
+		}
+		/// <summary>
+		/// Connect to a given reader or port with a specified timeout on the ping response
+		/// </summary>
+		/// <param name="deviceName">Name of Device</param>
+		/// <param name="timeout">Timeout in ms</param>
+		/// <returns></returns>
+		public bool ConnectWithTimeout(string deviceName,int timeout)
+		{
+			Command cmd = new Ping();
+			AutoResetEvent receivedResp = new AutoResetEvent(false);
+			bool success = false;
+
+			if (!conn.Connect(deviceName))
+				return false;
+
+			Callback resp = (ResponseFrame frame, Exception e) =>
+			{
+				if (TcmpFrame.IsValidFrame(frame))
+					success = true;
+				receivedResp.Set();
+			};
+
+			SendCommand(cmd, resp);
+			receivedResp.WaitOne(timeout);
+
+			if (success)
+				DeviceName = deviceName;
+
+			return success;
+		}
+
+
+
+		/// <summary>
+		/// Disconnect from the current reader
+		/// </summary>
+		public void Disconnect()
         {
             conn.Disconnect();
             DeviceName = null;
@@ -328,7 +422,7 @@ public string[] GetAvailableDevices()
         public string DeviceName
         {
             get;
-            internal set;
+            set;
         }
 
         /// <summary>
@@ -379,7 +473,39 @@ private void _Send(CommandFrame frame, Callback responseCallback = null)
             }
         }
 
-        public void Dispose()
+		/// <summary>
+		/// Get the BLE connetion status of the TappyBLE
+		/// </summary>
+		public bool isConnected()
+		{
+			return conn.getConnectionStatus();
+		}
+		/// <summary>
+		/// Get a boolean indicating if the Bluegiga dongle is connected
+		/// </summary>
+
+		public bool isBlueGigaConnected()
+		{
+			return conn.getBlueGigaStatus();
+		}
+
+		/// <summary>
+		/// Add a method to be called if the BLE is disconnected
+		/// </summary>
+		public void setDisconnectCallback(Bluegiga.BLE.Events.Connection.DisconnectedEventHandler disconnectCallback)
+		{
+			conn.setDisconnectCallback(disconnectCallback);
+		}
+
+		/// <summary>
+		/// Disconnect the BlueGiga dongle
+		/// </summary>
+		public void DisconnectBlueGiga()
+		{
+			conn.DisconnectBlueGiga();
+		}
+
+		public void Dispose()
         {
             conn.Dispose();
         }
diff --git a/Tcmp-SDK/Tcmp/Communication/UsbConnection.cs b/Tcmp-SDK/Tcmp/Communication/UsbConnection.cs
index 30f07b2..2a8be49 100644
--- a/Tcmp-SDK/Tcmp/Communication/UsbConnection.cs
+++ b/Tcmp-SDK/Tcmp/Communication/UsbConnection.cs
@@ -55,7 +55,17 @@ public override string[] GetAvailableDevices()
             return SerialPort.GetPortNames();
         }
 
-        public override void Send(byte[] data)
+		public override string[] GetAvailableDevices(int timeout)
+		{
+			return SerialPort.GetPortNames();
+		}
+
+		public override string[] GetAvailableDevices(int timeout, bool scanForBlueGiga)
+		{
+			return SerialPort.GetPortNames();
+		}
+
+		public override void Send(byte[] data)
         {
             Debug.Write("   sending: ");
             Debug.Write(BitConverter.ToString(data));
@@ -91,7 +101,30 @@ public override int Read(List<byte> buffer)
             return count;
         }
 
-        public override void Flush()
+		public override bool getConnectionStatus()
+		{
+			throw new System.NotImplementedException();
+
+		}
+
+		public override bool getBlueGigaStatus()
+		{
+			throw new System.NotImplementedException();
+
+		}
+
+
+		public override void setDisconnectCallback(Bluegiga.BLE.Events.Connection.DisconnectedEventHandler disconnectCallback)
+		{
+			throw new System.NotImplementedException();
+		}
+
+		public override void DisconnectBlueGiga()
+		{
+			throw new NotImplementedException();
+		}
+
+		public override void Flush()
         {
             if (port.IsOpen)
             {