From 9513f94dca89bce480e55c8f7c5ed7cb3825effe Mon Sep 17 00:00:00 2001
From: weiwentan23 <weiwentan@shimmersensing.com>
Date: Tue, 25 Jan 2022 10:58:24 +0800
Subject: [PATCH 1/2] add scan function for multi verisense example

---
 .../MultiVerisenseExample.Android.csproj      |   6 +-
 .../MultiVerisenseExample.UWP.csproj          |   6 +-
 .../MultiVerisenseExample.iOS.csproj          |   6 +-
 .../MultiVerisenseExample/MainPage.xaml       |  17 +-
 .../MultiVerisenseExample/MainPage.xaml.cs    | 275 ++++++++++++------
 .../Communications/RadioPluginBLE.cs          |   4 +-
 6 files changed, 217 insertions(+), 97 deletions(-)

diff --git a/ShimmerBLE/MultiVerisenseExample/MultiVerisenseExample.Android/MultiVerisenseExample.Android.csproj b/ShimmerBLE/MultiVerisenseExample/MultiVerisenseExample.Android/MultiVerisenseExample.Android.csproj
index 9a8813ea..69275561 100644
--- a/ShimmerBLE/MultiVerisenseExample/MultiVerisenseExample.Android/MultiVerisenseExample.Android.csproj
+++ b/ShimmerBLE/MultiVerisenseExample/MultiVerisenseExample.Android/MultiVerisenseExample.Android.csproj
@@ -100,13 +100,17 @@
     <Content Include="Libs\Plugin.BLE.dll" />
   </ItemGroup>
   <ItemGroup>
+    <ProjectReference Include="..\..\ShimmerBLEAPI.Android\ShimmerBLEAPI.Android.csproj">
+      <Project>{381507d7-64e0-464d-a100-1f981c6a5235}</Project>
+      <Name>ShimmerBLEAPI.Android</Name>
+    </ProjectReference>
     <ProjectReference Include="..\..\ShimmerBLEAPI\ShimmerBLEAPI.csproj">
       <Project>{2B423ED5-9DB8-40FE-8C0C-DCDAFE0E6229}</Project>
       <Name>ShimmerBLEAPI</Name>
     </ProjectReference>
     <ProjectReference Include="..\MultiVerisenseExample\MultiVerisenseExample.csproj">
       <Project>{dd54040d-e677-4533-b953-2aedf0b3a55e}</Project>
-      <Name>MultiShimmerExample</Name>
+      <Name>MultiVerisenseExample</Name>
     </ProjectReference>
   </ItemGroup>
   <Import Project="$(MSBuildExtensionsPath)\Xamarin\Android\Xamarin.Android.CSharp.targets" />
diff --git a/ShimmerBLE/MultiVerisenseExample/MultiVerisenseExample.UWP/MultiVerisenseExample.UWP.csproj b/ShimmerBLE/MultiVerisenseExample/MultiVerisenseExample.UWP/MultiVerisenseExample.UWP.csproj
index 15a61593..13d7ed9c 100644
--- a/ShimmerBLE/MultiVerisenseExample/MultiVerisenseExample.UWP/MultiVerisenseExample.UWP.csproj
+++ b/ShimmerBLE/MultiVerisenseExample/MultiVerisenseExample.UWP/MultiVerisenseExample.UWP.csproj
@@ -154,13 +154,17 @@
     <PackageReference Include="Xamarin.Essentials" Version="1.5.3.2" />
   </ItemGroup>
   <ItemGroup>
+    <ProjectReference Include="..\..\ShimmerBLEAPI.UWP\ShimmerBLEAPI.UWP.csproj">
+      <Project>{76908925-02bb-433b-a9e5-bb07edfcb9c9}</Project>
+      <Name>ShimmerBLEAPI.UWP</Name>
+    </ProjectReference>
     <ProjectReference Include="..\..\ShimmerBLEAPI\ShimmerBLEAPI.csproj">
       <Project>{2b423ed5-9db8-40fe-8c0c-dcdafe0e6229}</Project>
       <Name>ShimmerBLEAPI</Name>
     </ProjectReference>
     <ProjectReference Include="..\MultiVerisenseExample\MultiVerisenseExample.csproj">
       <Project>{dd54040d-e677-4533-b953-2aedf0b3a55e}</Project>
-      <Name>MultiShimmerExample</Name>
+      <Name>MultiVerisenseExample</Name>
     </ProjectReference>
   </ItemGroup>
   <ItemGroup />
diff --git a/ShimmerBLE/MultiVerisenseExample/MultiVerisenseExample.iOS/MultiVerisenseExample.iOS.csproj b/ShimmerBLE/MultiVerisenseExample/MultiVerisenseExample.iOS/MultiVerisenseExample.iOS.csproj
index 28eea00e..6eb8bdc8 100644
--- a/ShimmerBLE/MultiVerisenseExample/MultiVerisenseExample.iOS/MultiVerisenseExample.iOS.csproj
+++ b/ShimmerBLE/MultiVerisenseExample/MultiVerisenseExample.iOS/MultiVerisenseExample.iOS.csproj
@@ -157,13 +157,17 @@
     <Content Include="Libs\Plugin.BLE.dll" />
   </ItemGroup>
   <ItemGroup>
+    <ProjectReference Include="..\..\ShimmerBLEAPI.iOS\ShimmerBLEAPI.iOS.csproj">
+      <Project>{7384146a-cbdd-4e65-a20f-cb9597378b26}</Project>
+      <Name>ShimmerBLEAPI.iOS</Name>
+    </ProjectReference>
     <ProjectReference Include="..\..\ShimmerBLEAPI\ShimmerBLEAPI.csproj">
       <Project>{2b423ed5-9db8-40fe-8c0c-dcdafe0e6229}</Project>
       <Name>ShimmerBLEAPI</Name>
     </ProjectReference>
     <ProjectReference Include="..\MultiVerisenseExample\MultiVerisenseExample.csproj">
       <Project>{dd54040d-e677-4533-b953-2aedf0b3a55e}</Project>
-      <Name>MultiShimmerExample</Name>
+      <Name>MultiVerisenseExample</Name>
     </ProjectReference>
   </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/ShimmerBLE/MultiVerisenseExample/MultiVerisenseExample/MainPage.xaml b/ShimmerBLE/MultiVerisenseExample/MultiVerisenseExample/MainPage.xaml
index a618b1ec..b6fc9f20 100644
--- a/ShimmerBLE/MultiVerisenseExample/MultiVerisenseExample/MainPage.xaml
+++ b/ShimmerBLE/MultiVerisenseExample/MultiVerisenseExample/MainPage.xaml
@@ -7,16 +7,30 @@
         <Frame BackgroundColor="#2196F3" Padding="10" CornerRadius="0">
             <Label Text="MultiVerisenseExample" HorizontalTextAlignment="Center" TextColor="White" FontSize="24"/>
         </Frame>
+        <StackLayout Orientation="Horizontal">
+            <Button Clicked="scanDevicesButton_Clicked" x:Name="scanDevicesButton" WidthRequest="150" HeightRequest="50" Text="Scan Devices"></Button>
+        </StackLayout>
         <ListView
             x:Name="deviceList"
             HasUnevenRows="True"
             HeightRequest="100"
+            SelectionMode="None"
             CachingStrategy="RecycleElement">
             <ListView.ItemTemplate>
                 <DataTemplate>
                     <ViewCell>
                         <StackLayout Orientation="Vertical" VerticalOptions="Center">
-                            <Label Text="{Binding Uuid, StringFormat='{0}'}" FontSize="Small" />
+                            <StackLayout.HeightRequest>
+                                <OnPlatform x:TypeArguments="x:Double">
+                                    <On Platform="iOS">130</On>
+                                    <On Platform="Android,UWP">-1</On>
+                                </OnPlatform>
+                            </StackLayout.HeightRequest>
+                            <StackLayout Orientation="Horizontal">
+                                <CheckBox IsChecked="{Binding IsSelected}"></CheckBox>
+                                <Label Text="{Binding Uuid, StringFormat='{0}'}" FontSize="Micro" />
+                                <Label Text="{Binding IsPaired}" Margin="50, 0, 0, 0" FontSize="Micro" />
+                            </StackLayout>
                             <StackLayout Orientation="Horizontal">
                                 <Label Text="{Binding Status}" TextColor="Blue" FontSize="Micro"/>
                                 <Label Text="{Binding TransferSpeed}" TextColor="Blue" FontSize="Micro"/>
@@ -31,6 +45,7 @@
         <Grid>
             <ScrollView Orientation="Horizontal">
                 <StackLayout Orientation="Horizontal">
+                    <Button Clicked="pairDevicesButton_Clicked" x:Name="pairDevicesButton" WidthRequest="150" HeightRequest="60" Text="Pair Devices"></Button>
                     <Button Clicked="connectDevicesButton_Clicked" x:Name="connectDevicesButton" WidthRequest="150" HeightRequest="60" Text="Connect Devices"></Button>
                     <Button Clicked="startStreamingButton_Clicked" x:Name="startStreamingButton" WidthRequest="150" HeightRequest="60" Text="Start Streaming"></Button>
                     <Button Clicked="stopStreamingButton_Clicked" x:Name="stopStreamingButton" WidthRequest="150" HeightRequest="60" Text="Stop Streaming"></Button>
diff --git a/ShimmerBLE/MultiVerisenseExample/MultiVerisenseExample/MainPage.xaml.cs b/ShimmerBLE/MultiVerisenseExample/MultiVerisenseExample/MainPage.xaml.cs
index 394a9593..d0dbd20a 100644
--- a/ShimmerBLE/MultiVerisenseExample/MultiVerisenseExample/MainPage.xaml.cs
+++ b/ShimmerBLE/MultiVerisenseExample/MultiVerisenseExample/MainPage.xaml.cs
@@ -1,5 +1,6 @@
 using ShimmerBLEAPI;
 using ShimmerBLEAPI.Devices;
+using ShimmerBLEAPI.Models;
 using System;
 using System.Collections.Generic;
 using System.Diagnostics;
@@ -11,12 +12,14 @@
 using System.ComponentModel;
 using static shimmer.Models.ShimmerBLEEventData;
 using static ShimmerBLEAPI.AbstractPlotManager;
+using shimmer.Services;
+using System.Linq;
+using System.Collections.ObjectModel;
 
 namespace MultiShimmerExample
 {
-    public partial class MainPage : ContentPage
+    public partial class MainPage : ContentPage, INotifyPropertyChanged
     {
-
         public class DeviceInfo : INotifyPropertyChanged
         {
             public event PropertyChangedEventHandler PropertyChanged;
@@ -42,74 +45,96 @@ private void NotifyPropertyChanged(string name)
             public string TransferSpeed { get { return _transferSpeed; } set { _transferSpeed = value; NotifyPropertyChanged("TransferSpeed"); } }
             private string _binFilePath { get; set; }
             public string BinFilePath { get { return _binFilePath; } set { _binFilePath = value; NotifyPropertyChanged("BinFilePath"); } }
+            private bool _isSelected { get; set; }
+            public bool IsSelected { get { return _isSelected; } set { _isSelected = value; NotifyPropertyChanged("IsSelected"); } }
+            private string _isPaired { get; set; }
+            public string IsPaired { get { return _isPaired; } set { _isPaired = value; NotifyPropertyChanged("IsPaired"); } }
+            public List<string[]> Signals { get; set; }
 
             public DeviceInfo(string uuid)
             {
                 Uuid = uuid;
+                Signals = new List<string[]>();
             }
         }
-        
+
         private Dictionary<string, VerisenseBLEDevice> ConnectedDevices = new Dictionary<string, VerisenseBLEDevice>();
-        private Dictionary<string, VerisenseBLEDevice> Devices = new Dictionary<string, VerisenseBLEDevice>();
         private Dictionary<string, bool> IsFirstOjcForDevice = new Dictionary<string, bool>();
         private PlotManager PlotManager;
-        //IVerisenseBLEManager bleManager = DependencyService.Get<IVerisenseBLEManager>();
-
-        List<DeviceInfo> deviceInfos = new List<DeviceInfo>();
-
-        List<string> uuids = new List<string>() //at some stage this should be retrieved from the OS, any verisense device
-        {
-            //"00000000-0000-0000-0000-e1ec063f5c80",
-            //"00000000-0000-0000-0000-daa56d898b02"
-            //"00000000-0000-0000-0000-e7452c6d6f14",
-            //"00000000-0000-0000-0000-c96117537402",
-            //"def7b570-bb64-5167-aa2c-76f634454258",
-            "7b3eba6c-026c-0861-bb0d-45d23d4dad64",
-            //"00000000-0000-0000-0000-daa619f04ad7",
-            //"00000000-0000-0000-0000-d02b463da2bb",
-            //"00000000-0000-0000-0000-e7ec37a0d234",
-            //"04514419-5ab1-6eee-a83d-334220dade3d",
-            //"ad973fda-127f-d52e-e6c7-0b9dd347e90d"
-
-        }; 
+        IVerisenseBLEManager bleManager = DependencyService.Get<IVerisenseBLEManager>();
+        ObservableCollection<DeviceInfo> deviceInfos = new ObservableCollection<DeviceInfo>();
+        List<string> uuids = new List<string>();
+        List<VerisenseBLEScannedDevice> ScannedDevices = new List<VerisenseBLEScannedDevice>();
 
         public MainPage()
         {
             InitializeComponent();
-            foreach (String uuid in uuids)
-            {
-                deviceInfos.Add(new DeviceInfo(uuid));
-            }
             PlotManager = new PlotManager("Data", "Data Point", "Timestamp", true);
             plotView.Model = PlotManager.BuildPlotModel();
-
-            //var service = DependencyService.Get<IVerisenseBLEManager>();
-            //bleManager.BLEManagerEvent += BLEManager_BLEEvent;
+            if (bleManager != null)
+            {
+                bleManager.BLEManagerEvent += BLEManager_BLEEvent;
+            }
             deviceList.ItemsSource = deviceInfos;
-            
         }
 
-        public async void ConnectDevices()
+        //public async void GetListOfVerisenseDevicesFromOS()
+        //{
+        //    //DeviceInformationCollection PairedBluetoothDevices = await DeviceInformation.FindAllAsync(BluetoothDevice.GetDeviceSelectorFromPairingState(true));
+        //    DeviceInformationCollection PairedBluetoothDevices = await DeviceInformation.FindAllAsync();
+        //    foreach (DeviceInformation deviceInfo in PairedBluetoothDevices)
+        //    {
+        //        if (deviceInfo.Name.Contains("Verisense"))
+        //        {
+        //            String uuid = "00000000-0000-0000-0000-" + deviceInfo.Id.Split('#')[1].Replace("Dev_", "").Split('_').Last();
+        //            if (!uuids.Contains(uuid))
+        //            {
+        //                uuids.Add(uuid);
+        //                deviceInfos.Add(new DeviceInfo(uuid));
+        //            }
+        //        }
+        //    }
+        //}
+
+        public DeviceInfo GetDeviceInfoFromUUID(string uuid)
         {
-            foreach (string uuid in uuids)
+            for (int i = 0; i < deviceInfos.Count; i++)
             {
-                VerisenseBLEDevice device = new VerisenseBLEDevice(uuid, "");
-                if (Devices.ContainsKey(uuid))
+                if (uuid == deviceInfos[i].Uuid)
                 {
-                    Devices.Remove(uuid);
-                    Devices.Add(uuid, device);
+                    return deviceInfos[i];
                 }
-                else
+            }
+            return null;
+        }
+
+        public async void PairDevices()
+        {
+            foreach (VerisenseBLEScannedDevice device in ScannedDevices)
+            {
+                if (GetDeviceInfoFromUUID(device.Uuid.ToString()).IsSelected)
                 {
-                    Devices.Add(uuid, device);
+                    var service = DependencyService.Get<IVerisenseBLEManager>();
+                    //var pairing = await service.PairVerisenseDevice(device, null);
+                    //device.IsPaired = pairing;
+                    //GetDeviceInfoFromUUID(device.Uuid.ToString()).IsPaired = pairing ? "Is Paired" : "Not Paired";
                 }
+            }
+        }
+
+        public async void ScanDevices()
+        {
+            await bleManager.StartScanForDevices();
+        }
 
-                device.ShimmerBLEEvent += ShimmerDevice_BLEEvent;
-                bool result = await device.Connect(true);
-                if (result)
+        public async void ConnectDevices()
+        {
+            foreach (string uuid in uuids)
+            {
+                if (GetDeviceInfoFromUUID(uuid).IsSelected)
                 {
-                    Debug.WriteLine("Device Version: " + device.GetProductionConfig().REV_HW_MAJOR + "." + device.GetProductionConfig().REV_HW_MINOR);
-                    Debug.WriteLine("Firmware Version: " + device.GetProductionConfig().REV_FW_MAJOR + "." + device.GetProductionConfig().REV_FW_MINOR + "." + device.GetProductionConfig().REV_FW_INTERNAL);
+                    VerisenseBLEDevice device = new VerisenseBLEDevice(uuid, "");
+                    // to get the connecting status
                     if (ConnectedDevices.ContainsKey(uuid))
                     {
                         ConnectedDevices.Remove(uuid);
@@ -119,12 +144,32 @@ public async void ConnectDevices()
                     {
                         ConnectedDevices.Add(uuid, device);
                     }
-                    Debug.WriteLine("\nBT state: " + device.GetVerisenseBLEState() + "\nUUID: " + device.Asm_uuid + "\nBattery: " + device.GetStatus().BatteryPercent + "%");
-                    ConfigureDevice(device);
-                }
-                else
-                {
-                    Debug.WriteLine("Failed to connect device! UUID: " + uuid);
+                    device.ShimmerBLEEvent += ShimmerDevice_BLEEvent;
+                    bool result = await device.Connect(true);
+                    if (result)
+                    {
+                        Debug.WriteLine("Device Version: " + device.GetProductionConfig().REV_HW_MAJOR + "." + device.GetProductionConfig().REV_HW_MINOR);
+                        Debug.WriteLine("Firmware Version: " + device.GetProductionConfig().REV_FW_MAJOR + "." + device.GetProductionConfig().REV_FW_MINOR + "." + device.GetProductionConfig().REV_FW_INTERNAL);
+                        if (ConnectedDevices.ContainsKey(uuid))
+                        {
+                            ConnectedDevices.Remove(uuid);
+                            ConnectedDevices.Add(uuid, device);
+                        }
+                        else if (!ConnectedDevices.ContainsKey(uuid))
+                        {
+                            ConnectedDevices.Add(uuid, device);
+                        }
+                        Debug.WriteLine("\nBT state: " + device.GetVerisenseBLEState() + "\nUUID: " + device.Asm_uuid + "\nBattery: " + device.GetStatus().BatteryPercent + "%");
+                        ConfigureDevice(device);
+                    }
+                    else
+                    {
+                        if (ConnectedDevices.ContainsKey(uuid))
+                        {
+                            ConnectedDevices.Remove(uuid);
+                        }
+                        Debug.WriteLine("Failed to connect device! UUID: " + uuid);
+                    }
                 }
             }
         }
@@ -152,18 +197,21 @@ public async void StartStreamingDevices()
         {
             foreach (VerisenseBLEDevice device in ConnectedDevices.Values)
             {
-                var streamResult = await device.ExecuteRequest(RequestType.StartStreaming);
-                Debug.WriteLine("Stream Status: " + streamResult);
-                if (device != null)
+                if (GetDeviceInfoFromUUID(device.Asm_uuid.ToString()).IsSelected)
                 {
-                    if (!IsFirstOjcForDevice.ContainsKey(device.Asm_uuid.ToString()))
+                    var streamResult = await device.ExecuteRequest(RequestType.StartStreaming);
+                    Debug.WriteLine("Stream Status: " + streamResult);
+                    if (device != null)
                     {
-                        IsFirstOjcForDevice.Add(device.Asm_uuid.ToString(), true);
-                    }
+                        if (!IsFirstOjcForDevice.ContainsKey(device.Asm_uuid.ToString()))
+                        {
+                            IsFirstOjcForDevice.Add(device.Asm_uuid.ToString(), true);
+                        }
 
-                    device.ShimmerBLEEvent -= ShimmerDevice_BLEEvent;
+                        device.ShimmerBLEEvent -= ShimmerDevice_BLEEvent;
+                    }
+                    device.ShimmerBLEEvent += ShimmerDevice_BLEEvent;
                 }
-                device.ShimmerBLEEvent += ShimmerDevice_BLEEvent;
             }
         }
 
@@ -171,13 +219,16 @@ public async void StartDataSync()
         {
             foreach (VerisenseBLEDevice device in ConnectedDevices.Values)
             {
-                var syncResult = device.ExecuteRequest(RequestType.TransferLoggedData);
-                Debug.WriteLine("Sync Status: " + syncResult);
-                if (device != null)
+                if (GetDeviceInfoFromUUID(device.Asm_uuid.ToString()).IsSelected)
                 {
-                    device.ShimmerBLEEvent -= ShimmerDevice_BLEEvent;
+                    var syncResult = device.ExecuteRequest(RequestType.TransferLoggedData);
+                    Debug.WriteLine("Sync Status: " + syncResult);
+                    if (device != null)
+                    {
+                        device.ShimmerBLEEvent -= ShimmerDevice_BLEEvent;
+                    }
+                    device.ShimmerBLEEvent += ShimmerDevice_BLEEvent;
                 }
-                device.ShimmerBLEEvent += ShimmerDevice_BLEEvent;
             }
         }
 
@@ -185,10 +236,10 @@ private void ShimmerDevice_BLEEvent(object sender, ShimmerBLEEventData e)
         {
             if (e.CurrentEvent == VerisenseBLEEvent.StateChange)
             {
-                int index = deviceInfos.FindIndex(x => x.Uuid == e.ASMID);
-                if (index >= 0)
+                DeviceInfo deviceInfo = GetDeviceInfoFromUUID(e.ASMID);
+                if (deviceInfo != null && ConnectedDevices.ContainsKey(e.ASMID))
                 {
-                    deviceInfos[index].Status = Devices[e.ASMID].GetVerisenseBLEState().ToString();
+                    deviceInfo.Status = ConnectedDevices[e.ASMID].GetVerisenseBLEState().ToString();
                 }
             }
             else if (e.CurrentEvent == VerisenseBLEEvent.NewDataPacket)
@@ -205,6 +256,7 @@ private void ShimmerDevice_BLEEvent(object sender, ShimmerBLEEventData e)
                         if (signal[(int)SignalArrayIndex.Format].Equals(ShimmerConfiguration.SignalFormats.CAL) && signal[(int)SignalArrayIndex.Name].Contains("Accel"))
                         {
                             PlotManager.AddSignalToPlotDefaultColors(signal);
+                            GetDeviceInfoFromUUID(e.ASMID).Signals.Add(signal);
                         }
                         else if (signal[(int)SignalArrayIndex.Name].Equals(ShimmerConfiguration.SignalNames.SYSTEM_TIMESTAMP))
                         {
@@ -224,58 +276,94 @@ private void ShimmerDevice_BLEEvent(object sender, ShimmerBLEEventData e)
             else if (e.CurrentEvent == VerisenseBLEEvent.SyncLoggedDataNewPayload)
             {
                 string[] words = e.Message.Split('(');
-                int index = deviceInfos.FindIndex(x => x.Uuid == e.ASMID);
-                if (index >= 0)
+                DeviceInfo deviceInfo = GetDeviceInfoFromUUID(e.ASMID);
+                if (deviceInfo != null)
                 {
-                    deviceInfos[index].TransferSpeed = words[0];
-                    deviceInfos[index].PayloadIndex = words[1].Remove(words[1].Length - 1);
-                    deviceInfos[index].BinFilePath = Devices[e.ASMID].dataFilePath;
+                    deviceInfo.TransferSpeed = words[0];
+                    deviceInfo.PayloadIndex = words[1].Remove(words[1].Length - 1);
+                    deviceInfo.BinFilePath = ConnectedDevices[e.ASMID].dataFilePath;
                 }
             }
         }
 
         private void BLEManager_BLEEvent(object sender, BLEManagerEvent e)
         {
-
             if (e.CurrentEvent == BLEManagerEvent.BLEAdapterEvent.ScanCompleted)
             {
-
+                foreach (VerisenseBLEScannedDevice device in bleManager.GetListOfScannedDevices())
+                {
+                    if (device.Name.Contains("Verisense") && device.IsConnectable && GetDeviceInfoFromUUID(device.Uuid.ToString()) == null)
+                    {
+                        uuids.Add(device.Uuid.ToString());
+                        deviceInfos.Add(new DeviceInfo(device.Uuid.ToString()));
+                        GetDeviceInfoFromUUID(device.Uuid.ToString()).IsPaired = device.IsPaired ? "Is Paired" : "Not Paired";
+                        if (!ScannedDevices.Contains(device))
+                        {
+                            ScannedDevices.Add(device);
+                        }
+                    }
+                }
             }
             else if (e.CurrentEvent == BLEManagerEvent.BLEAdapterEvent.DevicePaired)
             {
-
+                VerisenseBLEScannedDevice dev = (VerisenseBLEScannedDevice)e.objMsg;
+                if (GetDeviceInfoFromUUID(dev.Uuid.ToString()) != null)
+                {
+                    GetDeviceInfoFromUUID(dev.Uuid.ToString()).IsPaired = dev.IsPaired ? "Is Paired" : "Not Paired";
+                }
             }
             else if (e.CurrentEvent == BLEManagerEvent.BLEAdapterEvent.DeviceDiscovered)
             {
-                
+                VerisenseBLEScannedDevice dev = (VerisenseBLEScannedDevice)e.objMsg;
+                if (dev.Name.Contains("Verisense") && dev.IsConnectable && GetDeviceInfoFromUUID(dev.Uuid.ToString()) == null)
+                {
+                    uuids.Add(dev.Uuid.ToString());
+                    deviceInfos.Add(new DeviceInfo(dev.Uuid.ToString()));
+                    GetDeviceInfoFromUUID(dev.Uuid.ToString()).IsPaired = dev.IsPaired ? "Is Paired" : "Not Paired";
+                    if (!ScannedDevices.Contains(dev))
+                    {
+                        ScannedDevices.Add(dev);
+                    }
+                }
             }
         }
 
-
         public async void StopStreamingDevices()
         {
-            PlotManager.RemoveAllSignalsFromPlot();
             foreach (VerisenseBLEDevice device in ConnectedDevices.Values)
             {
-                var result = await device.ExecuteRequest(RequestType.StopStreaming);
-                IsFirstOjcForDevice[device.Asm_uuid.ToString()] = true;
-                Debug.WriteLine("\nUUID: " + device.Asm_uuid + " stop streaming request \nResult: " + result + "\n");
+                if (GetDeviceInfoFromUUID(device.Asm_uuid.ToString()).IsSelected)
+                {
+                    foreach (string[] signal in GetDeviceInfoFromUUID(device.Asm_uuid.ToString()).Signals)
+                    {
+                        PlotManager.RemoveSignalFromPlot(signal);
+                    }
+                    var result = await device.ExecuteRequest(RequestType.StopStreaming);
+                    IsFirstOjcForDevice[device.Asm_uuid.ToString()] = true;
+                    Debug.WriteLine("\nUUID: " + device.Asm_uuid + " stop streaming request \nResult: " + result + "\n");
+                }
             }
         }
 
         public async void DisconnectDevices()
         {
-            PlotManager.RemoveAllSignalsFromPlot();
             List<string> listOfDisconnectedUuids = new List<string>();
             foreach (VerisenseBLEDevice device in ConnectedDevices.Values)
             {
-                var result = await device.Disconnect();
-                if (result)
+                if (GetDeviceInfoFromUUID(device.Asm_uuid.ToString()).IsSelected)
                 {
-                    listOfDisconnectedUuids.Add(device.Asm_uuid.ToString());
-                }
+                    foreach (string[] signal in GetDeviceInfoFromUUID(device.Asm_uuid.ToString()).Signals)
+                    {
+                        PlotManager.RemoveSignalFromPlot(signal);
+                    }
+                    var result = await device.Disconnect();
+                    if (result)
+                    {
+                        listOfDisconnectedUuids.Add(device.Asm_uuid.ToString());
+                    }
 
-                Debug.WriteLine("\nUUID: " + device.Asm_uuid + " attempt disconnect \nResult: " + result + "\nNew BLE Status: " + device.GetVerisenseBLEState());
+                    Debug.WriteLine("\nUUID: " + device.Asm_uuid + " attempt disconnect \nResult: " + result + "\nNew BLE Status: " + device.GetVerisenseBLEState());
+                }
             }
 
             //Remove disconnected devices from the Dictionary
@@ -288,10 +376,15 @@ public async void DisconnectDevices()
         //------------------------------------------------------------------------------------------
 
         //GUI Functionality
-        //private void scanDevicesButton_Clicked(object sender, EventArgs e)
-        //{
-        //    bleManager.StartScanForDevices();
-        //}
+        private void pairDevicesButton_Clicked(object sender, EventArgs e)
+        {
+            PairDevices();
+        }
+
+        private void scanDevicesButton_Clicked(object sender, EventArgs e)
+        {
+            ScanDevices();
+        }
 
         private void connectDevicesButton_Clicked(object sender, EventArgs e)
         {
@@ -313,7 +406,7 @@ private void disconnectDevicesButton_Clicked(object sender, EventArgs e)
             DisconnectDevices();
         }
 
-        private void syncDevicesButton_Clicked(object sender,EventArgs e)
+        private void syncDevicesButton_Clicked(object sender, EventArgs e)
         {
             StartDataSync();
         }
diff --git a/ShimmerBLE/ShimmerBLEAPI/Communications/RadioPluginBLE.cs b/ShimmerBLE/ShimmerBLEAPI/Communications/RadioPluginBLE.cs
index d4e0847e..d8884234 100644
--- a/ShimmerBLE/ShimmerBLEAPI/Communications/RadioPluginBLE.cs
+++ b/ShimmerBLE/ShimmerBLEAPI/Communications/RadioPluginBLE.cs
@@ -150,7 +150,7 @@ private void Adapter_DeviceConnected(object sender, DeviceEventArgs e)
 
         private async void Adapter_DeviceDisconnected(object sender, DeviceEventArgs e)
         {
-            if (CommunicationEvent != null)
+            if (CommunicationEvent != null && e.Device.Id == ConnectedASM.Id)
             {
                 CommunicationEvent.Invoke(null, new ByteLevelCommunicationEvent { Event = Communications.ByteLevelCommunicationEvent.CommEvent.Disconnected });
                 if (ConnectedASM != null)
@@ -162,7 +162,7 @@ private async void Adapter_DeviceDisconnected(object sender, DeviceEventArgs e)
 
         private void Adapter_DeviceConnectionLost(object sender, DeviceEventArgs e)
         {
-            if (CommunicationEvent != null)
+            if (CommunicationEvent != null && e.Device.Id == ConnectedASM.Id)
             {
                 CommunicationEvent.Invoke(null, new ByteLevelCommunicationEvent { Event = Communications.ByteLevelCommunicationEvent.CommEvent.Disconnected });
             }

From 4534eb2eebc1688d80bc6572b44eab663178c526 Mon Sep 17 00:00:00 2001
From: weiwentan23 <weiwentan@shimmersensing.com>
Date: Thu, 27 Jan 2022 10:10:35 +0800
Subject: [PATCH 2/2] removed some unused code

---
 .../MultiVerisenseExample/MainPage.xaml       |  1 -
 .../MultiVerisenseExample/MainPage.xaml.cs    | 21 +------------------
 2 files changed, 1 insertion(+), 21 deletions(-)

diff --git a/ShimmerBLE/MultiVerisenseExample/MultiVerisenseExample/MainPage.xaml b/ShimmerBLE/MultiVerisenseExample/MultiVerisenseExample/MainPage.xaml
index b6fc9f20..42791530 100644
--- a/ShimmerBLE/MultiVerisenseExample/MultiVerisenseExample/MainPage.xaml
+++ b/ShimmerBLE/MultiVerisenseExample/MultiVerisenseExample/MainPage.xaml
@@ -45,7 +45,6 @@
         <Grid>
             <ScrollView Orientation="Horizontal">
                 <StackLayout Orientation="Horizontal">
-                    <Button Clicked="pairDevicesButton_Clicked" x:Name="pairDevicesButton" WidthRequest="150" HeightRequest="60" Text="Pair Devices"></Button>
                     <Button Clicked="connectDevicesButton_Clicked" x:Name="connectDevicesButton" WidthRequest="150" HeightRequest="60" Text="Connect Devices"></Button>
                     <Button Clicked="startStreamingButton_Clicked" x:Name="startStreamingButton" WidthRequest="150" HeightRequest="60" Text="Start Streaming"></Button>
                     <Button Clicked="stopStreamingButton_Clicked" x:Name="stopStreamingButton" WidthRequest="150" HeightRequest="60" Text="Stop Streaming"></Button>
diff --git a/ShimmerBLE/MultiVerisenseExample/MultiVerisenseExample/MainPage.xaml.cs b/ShimmerBLE/MultiVerisenseExample/MultiVerisenseExample/MainPage.xaml.cs
index d0dbd20a..3a5396ae 100644
--- a/ShimmerBLE/MultiVerisenseExample/MultiVerisenseExample/MainPage.xaml.cs
+++ b/ShimmerBLE/MultiVerisenseExample/MultiVerisenseExample/MainPage.xaml.cs
@@ -18,7 +18,7 @@
 
 namespace MultiShimmerExample
 {
-    public partial class MainPage : ContentPage, INotifyPropertyChanged
+    public partial class MainPage : ContentPage
     {
         public class DeviceInfo : INotifyPropertyChanged
         {
@@ -108,20 +108,6 @@ public DeviceInfo GetDeviceInfoFromUUID(string uuid)
             return null;
         }
 
-        public async void PairDevices()
-        {
-            foreach (VerisenseBLEScannedDevice device in ScannedDevices)
-            {
-                if (GetDeviceInfoFromUUID(device.Uuid.ToString()).IsSelected)
-                {
-                    var service = DependencyService.Get<IVerisenseBLEManager>();
-                    //var pairing = await service.PairVerisenseDevice(device, null);
-                    //device.IsPaired = pairing;
-                    //GetDeviceInfoFromUUID(device.Uuid.ToString()).IsPaired = pairing ? "Is Paired" : "Not Paired";
-                }
-            }
-        }
-
         public async void ScanDevices()
         {
             await bleManager.StartScanForDevices();
@@ -376,11 +362,6 @@ public async void DisconnectDevices()
         //------------------------------------------------------------------------------------------
 
         //GUI Functionality
-        private void pairDevicesButton_Clicked(object sender, EventArgs e)
-        {
-            PairDevices();
-        }
-
         private void scanDevicesButton_Clicked(object sender, EventArgs e)
         {
             ScanDevices();