Skip to content

VCBA-104 #46

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 2 commits into from
Jan 28, 2022
Merged

VCBA-104 #46

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a77770a
null check to be sure
JongChern Jan 27, 2022
d61596b
fix to plot manager, the count should increase even when the signal i…
JongChern Jan 27, 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
18 changes: 12 additions & 6 deletions ShimmerBLE/ShimmerBLEAPI/Communications/RadioPluginBLE.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -150,21 +150,27 @@ private void Adapter_DeviceConnected(object sender, DeviceEventArgs e)

private async void Adapter_DeviceDisconnected(object sender, DeviceEventArgs e)
{
if (CommunicationEvent != null && e.Device.Id == ConnectedASM.Id)
if (ConnectedASM != null)
{
CommunicationEvent.Invoke(null, new ByteLevelCommunicationEvent { Event = Communications.ByteLevelCommunicationEvent.CommEvent.Disconnected });
if (ConnectedASM != null)
if (CommunicationEvent != null && e.Device.Id == ConnectedASM.Id)
{
await Disconnect();
CommunicationEvent.Invoke(null, new ByteLevelCommunicationEvent { Event = Communications.ByteLevelCommunicationEvent.CommEvent.Disconnected });
if (ConnectedASM != null)
{
await Disconnect();
}
}
}
}

private void Adapter_DeviceConnectionLost(object sender, DeviceEventArgs e)
{
if (CommunicationEvent != null && e.Device.Id == ConnectedASM.Id)
if (ConnectedASM != null)
{
CommunicationEvent.Invoke(null, new ByteLevelCommunicationEvent { Event = Communications.ByteLevelCommunicationEvent.CommEvent.Disconnected });
if (CommunicationEvent != null && e.Device.Id == ConnectedASM.Id)
{
CommunicationEvent.Invoke(null, new ByteLevelCommunicationEvent { Event = Communications.ByteLevelCommunicationEvent.CommEvent.Disconnected });
}
}
}

Expand Down
2 changes: 1 addition & 1 deletion ShimmerBLE/ShimmerBLEAPI/PlotManager.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -126,8 +126,8 @@ private void PlotOjc(ObjectCluster ojc)
lineSeries.Points.RemoveAt(0);
lineSeries.Points.Add(new DataPoint(ts, yData));
}
count++;
}
count++;
}
PlotModel.InvalidatePlot(true);
Thread.Sleep(25);
Expand Down