Skip to content

Commit 9bfdc9a

Browse files
authored
Merge pull request #303 from open-ephys/issue-281
Combine all polled Bno055 classes into common type
2 parents c92492e + 76edca0 commit 9bfdc9a

22 files changed

+421
-564
lines changed

OpenEphys.Onix1.Design/Bno055Dialog.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,8 @@ private void FormShown(object sender, EventArgs e)
3232
{
3333
if (!TopLevel)
3434
{
35-
splitContainer1.Panel2Collapsed = true;
36-
splitContainer1.Panel2.Hide();
35+
tableLayoutPanel1.Controls.Remove(flowLayoutPanel1);
36+
tableLayoutPanel1.RowCount = 1;
3737

3838
MaximumSize = new System.Drawing.Size(0, 0);
3939
}

OpenEphys.Onix1.Design/Bno055Editor.cs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,8 @@ public override bool EditComponent(ITypeDescriptorContext context, object compon
2323
if (editorDialog.ShowDialog() == DialogResult.OK)
2424
{
2525
configureBno055.Enable = editorDialog.ConfigureNode.Enable;
26+
configureBno055.DeviceAddress = editorDialog.ConfigureNode.DeviceAddress;
27+
configureBno055.DeviceName = editorDialog.ConfigureNode.DeviceName;
2628

2729
return true;
2830
}

OpenEphys.Onix1.Design/GenericDeviceDialog.Designer.cs

Lines changed: 42 additions & 40 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

OpenEphys.Onix1.Design/NeuropixelsV1eBno055Dialog.cs

Lines changed: 0 additions & 42 deletions
This file was deleted.

OpenEphys.Onix1.Design/NeuropixelsV1eHeadstageDialog.cs

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ namespace OpenEphys.Onix1.Design
77
/// </summary>
88
/// <remarks>
99
/// Within the GUI, there is a tab for both devices encapsulated by a <see cref="ConfigureNeuropixelsV1eHeadstage"/>,
10-
/// specifically a <see cref="ConfigureNeuropixelsV1e"/> and a <see cref="ConfigureNeuropixelsV1eBno055"/>.
10+
/// specifically a <see cref="ConfigureNeuropixelsV1e"/> and a <see cref="ConfigurePolledBno055"/>.
1111
/// </remarks>
1212
public partial class NeuropixelsV1eHeadstageDialog : Form
1313
{
@@ -17,16 +17,16 @@ public partial class NeuropixelsV1eHeadstageDialog : Form
1717
public readonly NeuropixelsV1eDialog DialogNeuropixelsV1e;
1818

1919
/// <summary>
20-
/// Public method that provides access to the <see cref="NeuropixelsV1eBno055Dialog"/>.
20+
/// Public method that provides access to the <see cref="PolledBno055Dialog"/>.
2121
/// </summary>
22-
public readonly NeuropixelsV1eBno055Dialog DialogBno055;
22+
public readonly PolledBno055Dialog DialogBno055;
2323

2424
/// <summary>
2525
/// Initializes a new instance of a <see cref="NeuropixelsV1eHeadstageDialog"/>.
2626
/// </summary>
2727
/// <param name="configureNeuropixelsV1e">Configuration settings for a <see cref="ConfigureNeuropixelsV1e"/>.</param>
28-
/// <param name="configureBno055">Configuration settings for a <see cref="ConfigureNeuropixelsV1eBno055"/>.</param>
29-
public NeuropixelsV1eHeadstageDialog(ConfigureNeuropixelsV1e configureNeuropixelsV1e, ConfigureNeuropixelsV1eBno055 configureBno055)
28+
/// <param name="configureBno055">Configuration settings for a <see cref="ConfigurePolledBno055"/>.</param>
29+
public NeuropixelsV1eHeadstageDialog(ConfigureNeuropixelsV1e configureNeuropixelsV1e, ConfigurePolledBno055 configureBno055)
3030
{
3131
InitializeComponent();
3232

OpenEphys.Onix1.Design/NeuropixelsV2eBno055Dialog.Designer.cs

Lines changed: 0 additions & 39 deletions
This file was deleted.

OpenEphys.Onix1.Design/NeuropixelsV2eBno055Dialog.cs

Lines changed: 0 additions & 42 deletions
This file was deleted.

OpenEphys.Onix1.Design/NeuropixelsV2eBno055Editor.cs

Lines changed: 0 additions & 35 deletions
This file was deleted.

OpenEphys.Onix1.Design/NeuropixelsV2eHeadstageDialog.cs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,16 +13,16 @@ public partial class NeuropixelsV2eHeadstageDialog : Form
1313
public readonly NeuropixelsV2eDialog DialogNeuropixelsV2e;
1414

1515
/// <summary>
16-
/// A <see cref="NeuropixelsV2eBno055Dialog"/> that configures a <see cref="ConfigureNeuropixelsV2eBno055"/>.
16+
/// A <see cref="PolledBno055Dialog"/> that configures a <see cref="ConfigurePolledBno055"/>.
1717
/// </summary>
18-
public readonly NeuropixelsV2eBno055Dialog DialogBno055;
18+
public readonly PolledBno055Dialog DialogBno055;
1919

2020
/// <summary>
2121
/// Initializes a new instance of a <see cref="NeuropixelsV2eHeadstageDialog"/>.
2222
/// </summary>
2323
/// <param name="configureNeuropixelsV2e">Configuration settings for a <see cref="ConfigureNeuropixelsV2e"/>.</param>
24-
/// <param name="configureBno055">Configuration settings for a <see cref="ConfigureNeuropixelsV2eBno055"/>.</param>
25-
public NeuropixelsV2eHeadstageDialog(IConfigureNeuropixelsV2 configureNeuropixelsV2e, ConfigureNeuropixelsV2eBno055 configureBno055)
24+
/// <param name="configureBno055">Configuration settings for a <see cref="ConfigurePolledBno055"/>.</param>
25+
public NeuropixelsV2eHeadstageDialog(IConfigureNeuropixelsV2 configureNeuropixelsV2e, ConfigurePolledBno055 configureBno055)
2626
{
2727
InitializeComponent();
2828

OpenEphys.Onix1.Design/NeuropixelsV1eBno055Dialog.Designer.cs renamed to OpenEphys.Onix1.Design/PolledBno055Dialog.Designer.cs

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)