Skip to content

Commit e2b2dc0

Browse files
cjshacjsha
committed
Update tutorial/hardware example workflows
- This is for version 0.6.0 with persistent heartbeat which has minimum beats per second - This is also updates their subgraph workflows
1 parent 187c43b commit e2b2dc0

29 files changed

+428
-150
lines changed

‎workflows/hardware/breakout/breakout.bonsai

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?xml version="1.0" encoding="utf-8"?>
2-
<WorkflowBuilder Version="2.8.5"
2+
<WorkflowBuilder Version="2.9.0"
33
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
44
xmlns:onix1="clr-namespace:OpenEphys.Onix1;assembly=OpenEphys.Onix1"
55
xmlns:rx="clr-namespace:Bonsai.Reactive;assembly=Bonsai.Core"
@@ -18,10 +18,9 @@
1818
<Combinator xsi:type="onix1:ConfigureBreakoutBoard">
1919
<onix1:Name>BreakoutBoard</onix1:Name>
2020
<onix1:Heartbeat>
21-
<onix1:DeviceName>BreakoutBoard/Heartbeat</onix1:DeviceName>
21+
<onix1:DeviceName>BreakoutBoard/PersistentHeartbeat</onix1:DeviceName>
2222
<onix1:DeviceAddress>0</onix1:DeviceAddress>
23-
<onix1:Enable>true</onix1:Enable>
24-
<onix1:BeatsPerSecond>10</onix1:BeatsPerSecond>
23+
<onix1:BeatsPerSecond>100</onix1:BeatsPerSecond>
2524
</onix1:Heartbeat>
2625
<onix1:AnalogIO>
2726
<onix1:DeviceName>BreakoutBoard/AnalogIO</onix1:DeviceName>
@@ -56,6 +55,8 @@
5655
<onix1:DeviceName>BreakoutBoard/DigitalIO</onix1:DeviceName>
5756
<onix1:DeviceAddress>7</onix1:DeviceAddress>
5857
<onix1:Enable>true</onix1:Enable>
58+
<onix1:DeadTime>0</onix1:DeadTime>
59+
<onix1:SampleRate xsi:nil="true" />
5960
</onix1:DigitalIO>
6061
<onix1:ClockOutput>
6162
<onix1:DeviceName>BreakoutBoard/OutputClock</onix1:DeviceName>
@@ -248,7 +249,7 @@
248249
<io:Selector>Clock,HarpTime</io:Selector>
249250
</Expression>
250251
<Expression xsi:type="Combinator">
251-
<Combinator xsi:type="onix1:OutputClockData">
252+
<Combinator xsi:type="onix1:OutputClockHardwareParameters">
252253
<onix1:DeviceName>BreakoutBoard/OutputClock</onix1:DeviceName>
253254
</Combinator>
254255
</Expression>
@@ -269,7 +270,7 @@
269270
</Expression>
270271
<Expression xsi:type="Combinator">
271272
<Combinator xsi:type="onix1:HeartbeatData">
272-
<onix1:DeviceName>BreakoutBoard/Heartbeat</onix1:DeviceName>
273+
<onix1:DeviceName>BreakoutBoard/PersistentHeartbeat</onix1:DeviceName>
273274
</Combinator>
274275
</Expression>
275276
<Expression xsi:type="MemberSelector">

‎workflows/hardware/breakout/clock-output.bonsai

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
<?xml version="1.0" encoding="utf-8"?>
2-
<WorkflowBuilder Version="2.8.5"
2+
<WorkflowBuilder Version="2.9.0"
33
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
4-
xmlns:onix1="clr-namespace:OpenEphys.Onix1;assembly=OpenEphys.Onix1"
4+
xmlns:p1="clr-namespace:OpenEphys.Onix1;assembly=OpenEphys.Onix1"
55
xmlns:io="clr-namespace:Bonsai.IO;assembly=Bonsai.System"
66
xmlns="https://bonsai-rx.org/2018/workflow">
77
<Workflow>
88
<Nodes>
99
<Expression xsi:type="Combinator">
10-
<Combinator xsi:type="onix1:OutputClockData">
11-
<onix1:DeviceName>BreakoutBoard/OutputClock</onix1:DeviceName>
10+
<Combinator xsi:type="p1:OutputClockHardwareParameters">
11+
<p1:DeviceName>BreakoutBoard/OutputClock</p1:DeviceName>
1212
</Combinator>
1313
</Expression>
1414
<Expression xsi:type="io:CsvWriter">

‎workflows/hardware/breakout/configuration.bonsai

Lines changed: 19 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
11
<?xml version="1.0" encoding="utf-8"?>
2-
<WorkflowBuilder Version="2.8.5"
2+
<WorkflowBuilder Version="2.9.0"
33
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
44
xmlns:onix1="clr-namespace:OpenEphys.Onix1;assembly=OpenEphys.Onix1"
5+
xmlns:rx="clr-namespace:Bonsai.Reactive;assembly=Bonsai.Core"
6+
xmlns:io="clr-namespace:Bonsai.IO;assembly=Bonsai.System"
57
xmlns="https://bonsai-rx.org/2018/workflow">
68
<Workflow>
79
<Nodes>
@@ -15,10 +17,10 @@
1517
<Combinator xsi:type="onix1:ConfigureBreakoutBoard">
1618
<onix1:Name>BreakoutBoard</onix1:Name>
1719
<onix1:Heartbeat>
18-
<onix1:DeviceName>BreakoutBoard/Heartbeat</onix1:DeviceName>
20+
<onix1:DeviceName>BreakoutBoard/PersistentHeartbeat</onix1:DeviceName>
1921
<onix1:DeviceAddress>0</onix1:DeviceAddress>
2022
<onix1:Enable>true</onix1:Enable>
21-
<onix1:BeatsPerSecond>10</onix1:BeatsPerSecond>
23+
<onix1:BeatsPerSecond>100</onix1:BeatsPerSecond>
2224
</onix1:Heartbeat>
2325
<onix1:AnalogIO>
2426
<onix1:DeviceName>BreakoutBoard/AnalogIO</onix1:DeviceName>
@@ -57,7 +59,7 @@
5759
<onix1:ClockOutput>
5860
<onix1:DeviceName>BreakoutBoard/OutputClock</onix1:DeviceName>
5961
<onix1:DeviceAddress>5</onix1:DeviceAddress>
60-
<onix1:ClockGate>false</onix1:ClockGate>
62+
<onix1:ClockGate>true</onix1:ClockGate>
6163
<onix1:Frequency>1000000</onix1:Frequency>
6264
<onix1:DutyCycle>50</onix1:DutyCycle>
6365
<onix1:Delay>0</onix1:Delay>
@@ -82,10 +84,23 @@
8284
<onix1:WriteSize>2048</onix1:WriteSize>
8385
</Combinator>
8486
</Expression>
87+
<Expression xsi:type="Combinator">
88+
<Combinator xsi:type="rx:Timestamp" />
89+
</Expression>
90+
<Expression xsi:type="io:CsvWriter">
91+
<io:FileName>start-time_.csv</io:FileName>
92+
<io:Append>false</io:Append>
93+
<io:Overwrite>false</io:Overwrite>
94+
<io:Suffix>FileCount</io:Suffix>
95+
<io:IncludeHeader>false</io:IncludeHeader>
96+
<io:Selector>Timestamp,Value</io:Selector>
97+
</Expression>
8598
</Nodes>
8699
<Edges>
87100
<Edge From="0" To="1" Label="Source1" />
88101
<Edge From="1" To="2" Label="Source1" />
102+
<Edge From="1" To="3" Label="Source1" />
103+
<Edge From="3" To="4" Label="Source1" />
89104
</Edges>
90105
</Workflow>
91106
</WorkflowBuilder>

‎workflows/hardware/breakout/digital-inputs.bonsai

Lines changed: 37 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,47 +1,69 @@
11
<?xml version="1.0" encoding="utf-8"?>
2-
<WorkflowBuilder Version="2.8.5"
2+
<WorkflowBuilder Version="2.9.0"
33
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
44
xmlns:onix1="clr-namespace:OpenEphys.Onix1;assembly=OpenEphys.Onix1"
5-
xmlns:io="clr-namespace:Bonsai.IO;assembly=Bonsai.System"
5+
xmlns:dsp="clr-namespace:Bonsai.Dsp;assembly=Bonsai.Dsp"
66
xmlns="https://bonsai-rx.org/2018/workflow">
77
<Workflow>
88
<Nodes>
99
<Expression xsi:type="Combinator">
10-
<Combinator xsi:type="onix1:DigitalInput" />
11-
</Expression>
12-
<Expression xsi:type="io:CsvWriter">
13-
<io:FileName>digital-data_.csv</io:FileName>
14-
<io:Delimiter>;</io:Delimiter>
15-
<io:ListSeparator />
16-
<io:Append>false</io:Append>
17-
<io:Overwrite>false</io:Overwrite>
18-
<io:Suffix>FileCount</io:Suffix>
19-
<io:IncludeHeader>false</io:IncludeHeader>
20-
<io:Selector>Clock,DigitalInputs,Buttons</io:Selector>
10+
<Combinator xsi:type="onix1:DigitalInput">
11+
<onix1:DeviceName>BreakoutBoard/DigitalIO</onix1:DeviceName>
12+
</Combinator>
2113
</Expression>
2214
<Expression xsi:type="MemberSelector">
2315
<Selector>DigitalInputs</Selector>
2416
</Expression>
17+
<Expression xsi:type="Combinator">
18+
<Combinator xsi:type="dsp:MatrixWriter">
19+
<dsp:Path>digital-pins_.raw</dsp:Path>
20+
<dsp:Suffix>FileCount</dsp:Suffix>
21+
<dsp:Overwrite>false</dsp:Overwrite>
22+
<dsp:Layout>ColumnMajor</dsp:Layout>
23+
</Combinator>
24+
</Expression>
2525
<Expression xsi:type="HasFlag">
2626
<Operand xsi:type="WorkflowProperty" TypeArguments="onix1:DigitalPortState">
27-
<Value>Pin1</Value>
27+
<Value>Pin0</Value>
2828
</Operand>
2929
</Expression>
3030
<Expression xsi:type="MemberSelector">
3131
<Selector>Buttons</Selector>
3232
</Expression>
33+
<Expression xsi:type="Combinator">
34+
<Combinator xsi:type="dsp:MatrixWriter">
35+
<dsp:Path>digital-buttons_.raw</dsp:Path>
36+
<dsp:Suffix>FileCount</dsp:Suffix>
37+
<dsp:Overwrite>false</dsp:Overwrite>
38+
<dsp:Layout>ColumnMajor</dsp:Layout>
39+
</Combinator>
40+
</Expression>
3341
<Expression xsi:type="HasFlag">
3442
<Operand xsi:type="WorkflowProperty" TypeArguments="onix1:BreakoutButtonState">
3543
<Value>Triangle X</Value>
3644
</Operand>
3745
</Expression>
46+
<Expression xsi:type="MemberSelector">
47+
<Selector>Clock</Selector>
48+
</Expression>
49+
<Expression xsi:type="Combinator">
50+
<Combinator xsi:type="dsp:MatrixWriter">
51+
<dsp:Path>digital-clock_.raw</dsp:Path>
52+
<dsp:Suffix>FileCount</dsp:Suffix>
53+
<dsp:Overwrite>false</dsp:Overwrite>
54+
<dsp:Layout>ColumnMajor</dsp:Layout>
55+
</Combinator>
56+
</Expression>
3857
</Nodes>
3958
<Edges>
4059
<Edge From="0" To="1" Label="Source1" />
60+
<Edge From="0" To="4" Label="Source1" />
61+
<Edge From="0" To="7" Label="Source1" />
4162
<Edge From="1" To="2" Label="Source1" />
42-
<Edge From="1" To="4" Label="Source1" />
4363
<Edge From="2" To="3" Label="Source1" />
4464
<Edge From="4" To="5" Label="Source1" />
65+
<Edge From="5" To="6" Label="Source1" />
66+
<Edge From="7" To="8" Label="Source1" />
4567
</Edges>
4668
</Workflow>
4769
</WorkflowBuilder>

‎workflows/hardware/breakout/heartbeat.bonsai

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
<?xml version="1.0" encoding="utf-8"?>
2-
<WorkflowBuilder Version="2.8.5"
2+
<WorkflowBuilder Version="2.9.0"
33
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
44
xmlns:onix1="clr-namespace:OpenEphys.Onix1;assembly=OpenEphys.Onix1"
55
xmlns="https://bonsai-rx.org/2018/workflow">
66
<Workflow>
77
<Nodes>
88
<Expression xsi:type="Combinator">
99
<Combinator xsi:type="onix1:HeartbeatData">
10-
<onix1:DeviceName>BreakoutBoard/Heartbeat</onix1:DeviceName>
10+
<onix1:DeviceName>BreakoutBoard/PersistentHeartbeat</onix1:DeviceName>
1111
</Combinator>
1212
</Expression>
1313
<Expression xsi:type="MemberSelector">

‎workflows/hardware/hs64/configuration.bonsai

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?xml version="1.0" encoding="utf-8"?>
2-
<WorkflowBuilder Version="2.8.5"
2+
<WorkflowBuilder Version="2.9.0"
33
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
44
xmlns:onix1="clr-namespace:OpenEphys.Onix1;assembly=OpenEphys.Onix1"
55
xmlns:rx="clr-namespace:Bonsai.Reactive;assembly=Bonsai.Core"
@@ -17,10 +17,10 @@
1717
<Combinator xsi:type="onix1:ConfigureBreakoutBoard">
1818
<onix1:Name>BreakoutBoard</onix1:Name>
1919
<onix1:Heartbeat>
20-
<onix1:DeviceName>BreakoutBoard/Heartbeat</onix1:DeviceName>
20+
<onix1:DeviceName>BreakoutBoard/PersistentHeartbeat</onix1:DeviceName>
2121
<onix1:DeviceAddress>0</onix1:DeviceAddress>
2222
<onix1:Enable>true</onix1:Enable>
23-
<onix1:BeatsPerSecond>10</onix1:BeatsPerSecond>
23+
<onix1:BeatsPerSecond>100</onix1:BeatsPerSecond>
2424
</onix1:Heartbeat>
2525
<onix1:AnalogIO>
2626
<onix1:DeviceName>BreakoutBoard/AnalogIO</onix1:DeviceName>
@@ -73,7 +73,7 @@
7373
<onix1:MemoryMonitor>
7474
<onix1:DeviceName>BreakoutBoard/MemoryMonitor</onix1:DeviceName>
7575
<onix1:DeviceAddress>10</onix1:DeviceAddress>
76-
<onix1:Enable>true</onix1:Enable>
76+
<onix1:Enable>false</onix1:Enable>
7777
<onix1:SamplesPerSecond>10</onix1:SamplesPerSecond>
7878
</onix1:MemoryMonitor>
7979
</Combinator>
@@ -85,7 +85,7 @@
8585
<onix1:DeviceName>Headstage64/Rhd2164</onix1:DeviceName>
8686
<onix1:DeviceAddress>256</onix1:DeviceAddress>
8787
<onix1:Enable>true</onix1:Enable>
88-
<onix1:DspCutoff>Dsp146mHz</onix1:DspCutoff>
88+
<onix1:DspCutoff>Off</onix1:DspCutoff>
8989
<onix1:AnalogLowCutoff>Low100mHz</onix1:AnalogLowCutoff>
9090
<onix1:AnalogHighCutoff>High10000Hz</onix1:AnalogHighCutoff>
9191
</onix1:Rhd2164>
@@ -108,7 +108,9 @@
108108
<onix1:DeviceAddress>260</onix1:DeviceAddress>
109109
</onix1:OpticalStimulator>
110110
<onix1:Port>PortA</onix1:Port>
111-
<onix1:PortVoltage xsi:nil="true" />
111+
<onix1:PortVoltage>
112+
<onix1:Requested xsi:nil="true" />
113+
</onix1:PortVoltage>
112114
</Combinator>
113115
</Expression>
114116
<Expression xsi:type="Combinator">

‎workflows/hardware/hs64/hs64.bonsai

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -18,10 +18,9 @@
1818
<Combinator xsi:type="onix1:ConfigureBreakoutBoard">
1919
<onix1:Name>BreakoutBoard</onix1:Name>
2020
<onix1:Heartbeat>
21-
<onix1:DeviceName>BreakoutBoard/Heartbeat</onix1:DeviceName>
21+
<onix1:DeviceName>BreakoutBoard/PersistentHeartbeat</onix1:DeviceName>
2222
<onix1:DeviceAddress>0</onix1:DeviceAddress>
23-
<onix1:Enable>true</onix1:Enable>
24-
<onix1:BeatsPerSecond>10</onix1:BeatsPerSecond>
23+
<onix1:BeatsPerSecond>100</onix1:BeatsPerSecond>
2524
</onix1:Heartbeat>
2625
<onix1:AnalogIO>
2726
<onix1:DeviceName>BreakoutBoard/AnalogIO</onix1:DeviceName>
@@ -56,6 +55,8 @@
5655
<onix1:DeviceName>BreakoutBoard/DigitalIO</onix1:DeviceName>
5756
<onix1:DeviceAddress>7</onix1:DeviceAddress>
5857
<onix1:Enable>true</onix1:Enable>
58+
<onix1:DeadTime>0</onix1:DeadTime>
59+
<onix1:SampleRate xsi:nil="true" />
5960
</onix1:DigitalIO>
6061
<onix1:ClockOutput>
6162
<onix1:DeviceName>BreakoutBoard/OutputClock</onix1:DeviceName>
@@ -74,7 +75,7 @@
7475
<onix1:MemoryMonitor>
7576
<onix1:DeviceName>BreakoutBoard/MemoryMonitor</onix1:DeviceName>
7677
<onix1:DeviceAddress>10</onix1:DeviceAddress>
77-
<onix1:Enable>true</onix1:Enable>
78+
<onix1:Enable>false</onix1:Enable>
7879
<onix1:SamplesPerSecond>10</onix1:SamplesPerSecond>
7980
</onix1:MemoryMonitor>
8081
</Combinator>
@@ -86,7 +87,7 @@
8687
<onix1:DeviceName>Headstage64/Rhd2164</onix1:DeviceName>
8788
<onix1:DeviceAddress>256</onix1:DeviceAddress>
8889
<onix1:Enable>true</onix1:Enable>
89-
<onix1:DspCutoff>Dsp146mHz</onix1:DspCutoff>
90+
<onix1:DspCutoff>Off</onix1:DspCutoff>
9091
<onix1:AnalogLowCutoff>Low100mHz</onix1:AnalogLowCutoff>
9192
<onix1:AnalogHighCutoff>High10000Hz</onix1:AnalogHighCutoff>
9293
</onix1:Rhd2164>

‎workflows/hardware/np1e/configuration.bonsai

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,10 @@
1717
<Combinator xsi:type="onix1:ConfigureBreakoutBoard">
1818
<onix1:Name>BreakoutBoard</onix1:Name>
1919
<onix1:Heartbeat>
20-
<onix1:DeviceName>BreakoutBoard/Heartbeat</onix1:DeviceName>
20+
<onix1:DeviceName>BreakoutBoard/PersistentHeartbeat</onix1:DeviceName>
2121
<onix1:DeviceAddress>0</onix1:DeviceAddress>
2222
<onix1:Enable>true</onix1:Enable>
23-
<onix1:BeatsPerSecond>10</onix1:BeatsPerSecond>
23+
<onix1:BeatsPerSecond>100</onix1:BeatsPerSecond>
2424
</onix1:Heartbeat>
2525
<onix1:AnalogIO>
2626
<onix1:DeviceName>BreakoutBoard/AnalogIO</onix1:DeviceName>

‎workflows/hardware/np1e/np1e.bonsai

Lines changed: 5 additions & 4 deletions
Large diffs are not rendered by default.

‎workflows/hardware/np2e/configuration.bonsai

Lines changed: 9 additions & 4 deletions
Large diffs are not rendered by default.

‎workflows/hardware/np2e/np2e.bonsai

Lines changed: 13 additions & 7 deletions
Large diffs are not rendered by default.

0 commit comments

Comments
 (0)