Skip to content
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

Unify processor architecture and avoid exposing internal implementation classes #172

Merged
merged 4 commits into from
Jul 28, 2024
Merged

Unify processor architecture and avoid exposing internal implementation classes #172

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
c123dd5
Update package dependencies
glopesdev Jul 27, 2024
391ad2b
Unify processor architecture
glopesdev Jul 27, 2024
56e026c
Remove unused configuration operator for DS90UB9x
glopesdev Jul 27, 2024
7bdb036
Avoid exposing internal implementation classes
glopesdev Jul 27, 2024
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
5 changes: 1 addition & 4 deletions OpenEphys.Onix/OpenEphys.Onix.Design/OpenEphys.Onix.Design.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,12 +7,9 @@
<TargetFramework>net472</TargetFramework>
<UseWindowsForms>true</UseWindowsForms>
<VersionPrefix>0.1.0</VersionPrefix>
<Platforms>x64</Platforms>
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Bonsai.Core" Version="2.8.0" />
</ItemGroup>

<ItemGroup>
<ProjectReference Include="..\OpenEphys.Onix\OpenEphys.Onix.csproj" />
</ItemGroup>
Expand Down
30 changes: 5 additions & 25 deletions OpenEphys.Onix/OpenEphys.Onix.sln
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ VisualStudioVersion = 17.3.32825.248
MinimumVisualStudioVersion = 10.0.40219.1
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "OpenEphys.Onix", "OpenEphys.Onix\OpenEphys.Onix.csproj", "{353B1EBC-F8EB-4D99-8331-9FF15EC17F38}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenEphys.Onix.Design", "OpenEphys.Onix.Design\OpenEphys.Onix.Design.csproj", "{149E86EC-B865-463D-81A8-8290CA7F8871}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "OpenEphys.Onix.Design", "OpenEphys.Onix.Design\OpenEphys.Onix.Design.csproj", "{149E86EC-B865-463D-81A8-8290CA7F8871}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{F8644FAC-94E5-4E73-B809-925ABABE35B1}"
ProjectSection(SolutionItems) = preProject
Expand All @@ -14,38 +14,18 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
Debug|ARM64 = Debug|ARM64
Debug|x64 = Debug|x64
Release|Any CPU = Release|Any CPU
Release|ARM64 = Release|ARM64
Release|x64 = Release|x64
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{353B1EBC-F8EB-4D99-8331-9FF15EC17F38}.Debug|Any CPU.ActiveCfg = Debug|x64
{353B1EBC-F8EB-4D99-8331-9FF15EC17F38}.Debug|Any CPU.Build.0 = Debug|x64
{353B1EBC-F8EB-4D99-8331-9FF15EC17F38}.Debug|ARM64.ActiveCfg = Debug|x64
{353B1EBC-F8EB-4D99-8331-9FF15EC17F38}.Debug|ARM64.Build.0 = Debug|x64
{353B1EBC-F8EB-4D99-8331-9FF15EC17F38}.Debug|x64.ActiveCfg = Debug|x64
{353B1EBC-F8EB-4D99-8331-9FF15EC17F38}.Debug|x64.Build.0 = Debug|x64
{353B1EBC-F8EB-4D99-8331-9FF15EC17F38}.Release|Any CPU.ActiveCfg = Release|x64
{353B1EBC-F8EB-4D99-8331-9FF15EC17F38}.Release|Any CPU.Build.0 = Release|x64
{353B1EBC-F8EB-4D99-8331-9FF15EC17F38}.Release|ARM64.ActiveCfg = Release|ARM64
{353B1EBC-F8EB-4D99-8331-9FF15EC17F38}.Release|ARM64.Build.0 = Release|ARM64
{353B1EBC-F8EB-4D99-8331-9FF15EC17F38}.Release|x64.ActiveCfg = Release|x64
{353B1EBC-F8EB-4D99-8331-9FF15EC17F38}.Release|x64.Build.0 = Release|x64
{149E86EC-B865-463D-81A8-8290CA7F8871}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{149E86EC-B865-463D-81A8-8290CA7F8871}.Debug|Any CPU.Build.0 = Debug|Any CPU
{149E86EC-B865-463D-81A8-8290CA7F8871}.Debug|ARM64.ActiveCfg = Debug|Any CPU
{149E86EC-B865-463D-81A8-8290CA7F8871}.Debug|ARM64.Build.0 = Debug|Any CPU
{149E86EC-B865-463D-81A8-8290CA7F8871}.Debug|x64.ActiveCfg = Debug|Any CPU
{149E86EC-B865-463D-81A8-8290CA7F8871}.Debug|x64.Build.0 = Debug|Any CPU
{149E86EC-B865-463D-81A8-8290CA7F8871}.Release|Any CPU.ActiveCfg = Release|Any CPU
{149E86EC-B865-463D-81A8-8290CA7F8871}.Release|Any CPU.Build.0 = Release|Any CPU
{149E86EC-B865-463D-81A8-8290CA7F8871}.Release|ARM64.ActiveCfg = Release|Any CPU
{149E86EC-B865-463D-81A8-8290CA7F8871}.Release|ARM64.Build.0 = Release|Any CPU
{149E86EC-B865-463D-81A8-8290CA7F8871}.Release|x64.ActiveCfg = Release|Any CPU
{149E86EC-B865-463D-81A8-8290CA7F8871}.Release|x64.Build.0 = Release|Any CPU
{149E86EC-B865-463D-81A8-8290CA7F8871}.Debug|x64.ActiveCfg = Debug|x64
{149E86EC-B865-463D-81A8-8290CA7F8871}.Debug|x64.Build.0 = Debug|x64
{149E86EC-B865-463D-81A8-8290CA7F8871}.Release|x64.ActiveCfg = Release|x64
{149E86EC-B865-463D-81A8-8290CA7F8871}.Release|x64.Build.0 = Release|x64
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
Expand Down
32 changes: 19 additions & 13 deletions OpenEphys.Onix/OpenEphys.Onix/ConfigureFmcLinkController.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@

namespace OpenEphys.Onix
{
public abstract class ConfigureFmcLinkController : SingleDeviceFactory
internal abstract class ConfigureFmcLinkController : SingleDeviceFactory
{
public ConfigureFmcLinkController()
: base(typeof(FmcLinkController))
Expand Down Expand Up @@ -73,20 +73,26 @@ public override IObservable<ContextTask> Process(IObservable<ContextTask> source
return DeviceManager.RegisterDevice(deviceName, deviceInfo);
});
}
}

internal static class FmcLinkController
{
public const int ID = 23;
internal static class FmcLinkController
{
public const int ID = 23;

public const uint ENABLE = 0; // The LSB is used to enable or disable the device data stream
public const uint GPOSTATE = 1; // GPO output state (bits 31 downto 3: ignore. bits 2 downto 0: ‘1’ = high, ‘0’ = low)
public const uint DESPWR = 2; // Set link deserializer PDB state, 0 = deserializer power off else on. Does not affect port voltage.
public const uint PORTVOLTAGE = 3; // 10 * link voltage
public const uint SAVEVOLTAGE = 4; // Save link voltage to non-volatile EEPROM if greater than 0. This voltage will be applied after POR.
public const uint LINKSTATE = 5; // bit 1 pass; bit 0 lock
public const uint ENABLE = 0; // The LSB is used to enable or disable the device data stream
public const uint GPOSTATE = 1; // GPO output state (bits 31 downto 3: ignore. bits 2 downto 0: ‘1’ = high, ‘0’ = low)
public const uint DESPWR = 2; // Set link deserializer PDB state, 0 = deserializer power off else on. Does not affect port voltage.
public const uint PORTVOLTAGE = 3; // 10 * link voltage
public const uint SAVEVOLTAGE = 4; // Save link voltage to non-volatile EEPROM if greater than 0. This voltage will be applied after POR.
public const uint LINKSTATE = 5; // bit 1 pass; bit 0 lock

public const uint LINKSTATE_PP = 0x2; // parity check pass bit
public const uint LINKSTATE_SL = 0x1; // SERDES lock bit
}
public const uint LINKSTATE_PP = 0x2; // parity check pass bit
public const uint LINKSTATE_SL = 0x1; // SERDES lock bit
}

internal enum HubConfiguration
{
Standard,
Passthrough
}
}
30 changes: 1 addition & 29 deletions ....Onix/OpenEphys.Onix/ConfigureDS90UB9x.cs → OpenEphys.Onix/OpenEphys.Onix/DS90UB9x.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,33 +1,5 @@
using System;
using System.ComponentModel;

namespace OpenEphys.Onix
namespace OpenEphys.Onix
{
public class ConfigureDS90UB9x : SingleDeviceFactory
{
public ConfigureDS90UB9x()
: base(typeof(DS90UB9x))
{
}

[Category(ConfigurationCategory)]
[Description("Specifies whether the DS90UB9x raw device is enabled.")]
public bool Enable { get; set; } = true;

public override IObservable<ContextTask> Process(IObservable<ContextTask> source)
{
var enable = Enable;
var deviceName = DeviceName;
var deviceAddress = DeviceAddress;
return source.ConfigureDevice(context =>
{
var device = context.GetDeviceContext(deviceAddress, DeviceType);
device.WriteRegister(DS90UB9x.ENABLE, enable ? 1u : 0);
return DeviceManager.RegisterDevice(deviceName, device, DeviceType);
});
}
}

static class DS90UB9x
{
public const int ID = 24;
Expand Down
2 changes: 1 addition & 1 deletion OpenEphys.Onix/OpenEphys.Onix/DeviceContext.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

namespace OpenEphys.Onix
{
public class DeviceContext
internal class DeviceContext
{
readonly ContextTask _context;
readonly oni.Device _device;
Expand Down
8 changes: 0 additions & 8 deletions OpenEphys.Onix/OpenEphys.Onix/HubConfiguration.cs
View file
Open in desktop

This file was deleted.

4 changes: 2 additions & 2 deletions OpenEphys.Onix/OpenEphys.Onix/OpenEphys.Onix.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Bonsai.Core" Version="2.8.0" />
<PackageReference Include="clroni" Version="6.1.0" />
<PackageReference Include="Bonsai.Core" Version="2.8.5" />
<PackageReference Include="clroni" Version="6.1.2" />
<PackageReference Include="OpenCV.Net" Version="3.4.2" />
</ItemGroup>

Expand Down