Skip to content

Commit

Permalink
Merge branch 'main' into fix-dependencies
Browse files Browse the repository at this point in the history
  • Loading branch information
cjsha committed Nov 5, 2024
2 parents e92b4e0 + 5fc1a43 commit a7940aa
Show file tree
Hide file tree
Showing 9 changed files with 941 additions and 12 deletions.
11 changes: 0 additions & 11 deletions .bonsai/Bonsai.config
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,6 @@
<Package id="Bonsai.Audio" version="2.8.0" />
<Package id="Bonsai.Core" version="2.8.5" />
<Package id="Bonsai.Design" version="2.8.5" />
<Package id="Bonsai.Design.Visualizers" version="2.8.0" />
<Package id="Bonsai.Dsp" version="2.8.0" />
<Package id="Bonsai.Dsp.Design" version="2.8.0" />
<Package id="Bonsai.Editor" version="2.8.5" />
<Package id="Bonsai.Osc" version="2.7.0" />
<Package id="Bonsai.Scripting.Expressions" version="2.8.0" />
Expand Down Expand Up @@ -40,17 +37,13 @@
<Package id="System.Resources.Extensions" version="8.0.0" />
<Package id="System.Runtime.CompilerServices.Unsafe" version="4.5.3" />
<Package id="YamlDotNet" version="13.1.1" />
<Package id="ZedGraph" version="5.1.7" />
</Packages>
<AssemblyReferences>
<AssemblyReference assemblyName="Bonsai" />
<AssemblyReference assemblyName="Bonsai.Arduino" />
<AssemblyReference assemblyName="Bonsai.Audio" />
<AssemblyReference assemblyName="Bonsai.Core" />
<AssemblyReference assemblyName="Bonsai.Design" />
<AssemblyReference assemblyName="Bonsai.Design.Visualizers" />
<AssemblyReference assemblyName="Bonsai.Dsp" />
<AssemblyReference assemblyName="Bonsai.Dsp.Design" />
<AssemblyReference assemblyName="Bonsai.Editor" />
<AssemblyReference assemblyName="Bonsai.Osc" />
<AssemblyReference assemblyName="Bonsai.Scripting.Expressions" />
Expand All @@ -69,9 +62,6 @@
<AssemblyLocation assemblyName="Bonsai.Audio" processorArchitecture="MSIL" location="Packages/Bonsai.Audio.2.8.0/lib/net462/Bonsai.Audio.dll" />
<AssemblyLocation assemblyName="Bonsai.Core" processorArchitecture="MSIL" location="Packages/Bonsai.Core.2.8.5/lib/net462/Bonsai.Core.dll" />
<AssemblyLocation assemblyName="Bonsai.Design" processorArchitecture="MSIL" location="Packages/Bonsai.Design.2.8.5/lib/net462/Bonsai.Design.dll" />
<AssemblyLocation assemblyName="Bonsai.Design.Visualizers" processorArchitecture="MSIL" location="Packages/Bonsai.Design.Visualizers.2.8.0/lib/net462/Bonsai.Design.Visualizers.dll" />
<AssemblyLocation assemblyName="Bonsai.Dsp" processorArchitecture="MSIL" location="Packages/Bonsai.Dsp.2.8.0/lib/net462/Bonsai.Dsp.dll" />
<AssemblyLocation assemblyName="Bonsai.Dsp.Design" processorArchitecture="MSIL" location="Packages/Bonsai.Dsp.Design.2.8.0/lib/net462/Bonsai.Dsp.Design.dll" />
<AssemblyLocation assemblyName="Bonsai.Editor" processorArchitecture="MSIL" location="Packages/Bonsai.Editor.2.8.5/lib/net472/Bonsai.Editor.dll" />
<AssemblyLocation assemblyName="Bonsai.Osc" processorArchitecture="MSIL" location="Packages/Bonsai.Osc.2.7.0/lib/net462/Bonsai.Osc.dll" />
<AssemblyLocation assemblyName="Bonsai.Scripting.Expressions" processorArchitecture="MSIL" location="Packages/Bonsai.Scripting.Expressions.2.8.0/lib/net462/Bonsai.Scripting.Expressions.dll" />
Expand Down Expand Up @@ -103,7 +93,6 @@
<AssemblyLocation assemblyName="System.Resources.Extensions" processorArchitecture="MSIL" location="Packages/System.Resources.Extensions.8.0.0/lib/net462/System.Resources.Extensions.dll" />
<AssemblyLocation assemblyName="System.Runtime.CompilerServices.Unsafe" processorArchitecture="MSIL" location="Packages/System.Runtime.CompilerServices.Unsafe.4.5.3/lib/net461/System.Runtime.CompilerServices.Unsafe.dll" />
<AssemblyLocation assemblyName="YamlDotNet" processorArchitecture="MSIL" location="Packages/YamlDotNet.13.1.1/lib/net47/YamlDotNet.dll" />
<AssemblyLocation assemblyName="ZedGraph" processorArchitecture="MSIL" location="Packages/ZedGraph.5.1.7/lib/net35-Client/ZedGraph.dll" />
</AssemblyLocations>
<LibraryFolders>
<LibraryFolder path="Packages/Microsoft.Web.WebView2.1.0.1823.32/runtimes/win-arm64/native" platform="arm64" />
Expand Down
2 changes: 1 addition & 1 deletion src/onix-bonsai-onix1
405 changes: 405 additions & 0 deletions workflows/operators/ConfigureHeadstageRhs2116.bonsai

Large diffs are not rendered by default.

37 changes: 37 additions & 0 deletions workflows/operators/ConfigureRhs2116.bonsai
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
<?xml version="1.0" encoding="utf-8"?>
<WorkflowBuilder Version="2.8.5"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns:onix1="clr-namespace:OpenEphys.Onix1;assembly=OpenEphys.Onix1"
xmlns="https://bonsai-rx.org/2018/workflow">
<Workflow>
<Nodes>
<Expression xsi:type="Combinator">
<Combinator xsi:type="onix1:CreateContext">
<onix1:Driver>riffa</onix1:Driver>
<onix1:Index>0</onix1:Index>
</Combinator>
</Expression>
<Expression xsi:type="Combinator">
<Combinator xsi:type="onix1:ConfigureRhs2116">
<onix1:DeviceAddress>0</onix1:DeviceAddress>
<onix1:Enable>true</onix1:Enable>
<onix1:DspCutoff>Off</onix1:DspCutoff>
<onix1:AnalogLowCutoff>Low100mHz</onix1:AnalogLowCutoff>
<onix1:AnalogLowCutoffRecovery>Low250Hz</onix1:AnalogLowCutoffRecovery>
<onix1:AnalogHighCutoff>High10000Hz</onix1:AnalogHighCutoff>
<onix1:RespectExternalActiveStim>true</onix1:RespectExternalActiveStim>
</Combinator>
</Expression>
<Expression xsi:type="Combinator">
<Combinator xsi:type="onix1:StartAcquisition">
<onix1:ReadSize>2048</onix1:ReadSize>
<onix1:WriteSize>2048</onix1:WriteSize>
</Combinator>
</Expression>
</Nodes>
<Edges>
<Edge From="0" To="1" Label="Source1" />
<Edge From="1" To="2" Label="Source1" />
</Edges>
</Workflow>
</WorkflowBuilder>
36 changes: 36 additions & 0 deletions workflows/operators/ConfigureRhs2116Pair.bonsai
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
<?xml version="1.0" encoding="utf-8"?>
<WorkflowBuilder Version="2.8.5"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns:onix1="clr-namespace:OpenEphys.Onix1;assembly=OpenEphys.Onix1"
xmlns="https://bonsai-rx.org/2018/workflow">
<Workflow>
<Nodes>
<Expression xsi:type="Combinator">
<Combinator xsi:type="onix1:CreateContext">
<onix1:Driver>riffa</onix1:Driver>
<onix1:Index>0</onix1:Index>
</Combinator>
</Expression>
<Expression xsi:type="Combinator">
<Combinator xsi:type="onix1:ConfigureRhs2116Pair">
<onix1:DeviceAddress>0</onix1:DeviceAddress>
<onix1:Enable>true</onix1:Enable>
<onix1:DspCutoff>Off</onix1:DspCutoff>
<onix1:AnalogLowCutoff>Low100mHz</onix1:AnalogLowCutoff>
<onix1:AnalogLowCutoffRecovery>Low250Hz</onix1:AnalogLowCutoffRecovery>
<onix1:AnalogHighCutoff>High10000Hz</onix1:AnalogHighCutoff>
</Combinator>
</Expression>
<Expression xsi:type="Combinator">
<Combinator xsi:type="onix1:StartAcquisition">
<onix1:ReadSize>2048</onix1:ReadSize>
<onix1:WriteSize>2048</onix1:WriteSize>
</Combinator>
</Expression>
</Nodes>
<Edges>
<Edge From="0" To="1" Label="Source1" />
<Edge From="1" To="2" Label="Source1" />
</Edges>
</Workflow>
</WorkflowBuilder>
Loading

0 comments on commit a7940aa

Please sign in to comment.