Support RHS2116 streaming and stimulation #67
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
There was a problem hiding this comment. This file (along with a few others in the same OpenEphys.Onix/OpenEphys.Onix folder path) are leftovers from the old folder pattern. These should be removed. |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -31,12 +31,12 @@ public ConfigureHeadstageRhs2116() | |
| [TypeConverter(typeof(HubDeviceConverter))] | ||
| public ConfigureRhs2116Trigger StimulusTrigger { get; set; } = new(); | ||
|
|
||
| internal override void UpdateDeviceNames() | ||
| { | ||
| LinkController.DeviceName = GetFullDeviceName(nameof(LinkController)); | ||
| Rhs2116A.DeviceName = GetFullDeviceName(nameof(Rhs2116A)); | ||
| Rhs2116B.DeviceName = GetFullDeviceName(nameof(Rhs2116B)); | ||
| StimulusTrigger.DeviceName = GetFullDeviceName(nameof(StimulusTrigger)); | ||
| } | ||
|
|
||
| public PortName Port | ||
|
|
@@ -53,6 +53,16 @@ public PortName Port | |
| } | ||
| } | ||
|
|
||
|
|
||
| [Description("If defined, it will override automated voltage discovery and apply the specified voltage" + | ||
| "to the headstage. Warning: this device requires 3.4V to 4.4V for proper operation." + | ||
| "Supplying higher voltages may result in damage to the headstage.")] | ||
| public double? PortVoltage | ||
| { | ||
| get => LinkController.PortVoltage; | ||
| set => LinkController.PortVoltage = value; | ||
| } | ||
|
|
||
| internal override IEnumerable<IDeviceConfiguration> GetDevices() | ||
| { | ||
| yield return LinkController; | ||
|
|
@@ -65,40 +75,38 @@ class ConfigureHeadstageRhs2116LinkController : ConfigureFmcLinkController | |
| { | ||
| protected override bool ConfigurePortVoltage(DeviceContext device) | ||
| { | ||
| const double MinVoltage = 3.3; | ||
| const double MaxVoltage = 4.4; | ||
| const double VoltageOffset = 2.0; | ||
| const double VoltageIncrement = 0.2; | ||
|
|
||
| for (var voltage = MinVoltage; voltage <= MaxVoltage; voltage += VoltageIncrement) | ||
| { | ||
| SetPortVoltage(device, voltage); | ||
| if (base.CheckLinkState(device)) | ||
| { | ||
| SetPortVoltage(device, voltage + VoltageOffset); | ||
| return CheckLinkState(device); | ||
|
There was a problem hiding this comment. Just noticed this now, and was really confused. If we just need to reset before the last check, why not simply add My suspicion is that perhaps this is related to the case where we want to just set a port voltage override and therefore the code does not go through this path? In that case, maybe the best would be to mark There was a problem hiding this comment. I think this was addressed in #124 which does what you suggest. |
||
| } | ||
| } | ||
|
|
||
| return false; | ||
| } | ||
|
|
||
| private void SetPortVoltage(DeviceContext device, double voltage) | ||
| { | ||
| device.WriteRegister(FmcLinkController.PORTVOLTAGE, 0); | ||
| Thread.Sleep(500); | ||
| device.WriteRegister(FmcLinkController.PORTVOLTAGE, (uint)(10 * voltage)); | ||
| Thread.Sleep(500); | ||
| } | ||
|
|
||
| protected override bool CheckLinkState(DeviceContext device) | ||
| { | ||
| // NB: The RHS2116 headstage needs an additional reset after power on to provide its device table. | ||
| device.Context.Reset(); | ||
| var linkState = device.ReadRegister(FmcLinkController.LINKSTATE); | ||
| return (linkState & FmcLinkController.LINKSTATE_SL) != 0; | ||
| } | ||
| } | ||
| } | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Is the phase detector package used in the implementation, or just for examples?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Oops. Should not be there. Also don't know why I committed this file.