Skip to content

VCBA-93 #34

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 5 commits into from
Jan 13, 2022
Merged

VCBA-93 #34

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
a8a9afb
handle sensor not or just paired
MAzalya Jan 4, 2022
5bcbaca
Merge remote-tracking branch 'origin/VCBA-90' into VCBA-93
MAzalya Jan 5, 2022
97c4ab3
more updates
MAzalya Jan 6, 2022
507afaf
remove unused update
MAzalya Jan 6, 2022
1e32a9b
remove unused variable
JongChern Jan 13, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 10 additions & 3 deletions ShimmerBLE/ShimmerBLEAPI.iOS/Communications/VerisenseBLEManager.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
using Plugin.BLE.Abstractions.Contracts;
using shimmer.Communications;
using ShimmerBLEAPI.Communications;
using ShimmerBLEAPI.Devices;
using ShimmerBLEAPI.iOS.Communications;
using ShimmerBLEAPI.Models;
using System;
Expand Down Expand Up @@ -34,7 +35,7 @@ private void BLEManager_BLEEvent(object sender, BLEManagerEvent e)
}
else if (e.CurrentEvent == shimmer.Communications.BLEManagerEvent.BLEAdapterEvent.DevicePaired)
{
Console.WriteLine(((VerisenseBLEScannedDevice)e.objMsg).Uuid.ToString() + " is paired.");
Console.WriteLine(((VerisenseBLEDeviceIOS)e.objMsg).Asm_uuid.ToString() + " is paired.");
}
}
public List<VerisenseBLEScannedDevice> GetListOfScannedDevices()
Expand Down Expand Up @@ -102,9 +103,15 @@ public static bool GetBondingStatus(string id)

return isBonded;
}
public Task<bool> PairVerisenseDevice(object Device, IBLEPairingKeyGenerator generator)
public async Task<bool> PairVerisenseDevice(object Device, IBLEPairingKeyGenerator generator)
{
throw new NotImplementedException();
var pairingResult = await ((VerisenseBLEDeviceIOS)Device).PairDeviceAsync();
if (pairingResult)
{
if (BLEManagerEvent != null)
BLEManagerEvent.Invoke(null, new BLEManagerEvent { CurrentEvent = shimmer.Communications.BLEManagerEvent.BLEAdapterEvent.DevicePaired, objMsg = (VerisenseBLEDeviceIOS)Device, message = "Device Is Successfully Paired" });
}
return pairingResult;
}

public void StopScanForDevices()
Expand Down
2 changes: 1 addition & 1 deletion ShimmerBLE/ShimmerBLEAPI/Devices/VerisenseBLEDevice.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1686,7 +1686,7 @@ public async Task<bool> Connect(bool initialize, DeviceByteArraySettings configu
}
opConfig = UpdateDefaultDeviceConfigBytes(deviceOpConfig, configuration.GetOperationalConfigurationBytes());
}

var wopcresult = await ExecuteRequest(RequestType.WriteOperationalConfig, opConfig);
if (wopcresult == null)
{
Expand Down
2 changes: 1 addition & 1 deletion ShimmerBLE/ShimmerBLEAPI/Devices/VerisenseBLEDeviceIOS.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ public VerisenseBLEDeviceIOS(string id, string name) : base(id, name)
public async Task<bool> PairDeviceAsync()
{
var result = await Connect(false);

/*
InitializeRadio();
BLERadio.Asm_uuid = Asm_uuid;
Expand Down