Skip to content

Commit 59d63f4

Browse files
bruno-f-cruzbruno-f-cruz
committed
Refactor workflow to use adc converter
1 parent 0fe2fe5 commit 59d63f4

File tree

2 files changed

+38
-53
lines changed

2 files changed

+38
-53
lines changed

‎src/Extensions/SampleAction.bonsai‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -138,8 +138,9 @@
138138
<Combinator xsi:type="rx:WithLatestFrom" />
139139
</Expression>
140140
<Expression xsi:type="scr:ExpressionTransform">
141+
<scr:Name>SelectChannel</scr:Name>
141142
<scr:Expression>new(
142-
Item2 == 0 ? Item1.Value.Item1 : Item1.Value.Item2 as Value,
143+
Item2 == 0 ? Item1.Value.AnalogInput0 : Item1.Value.AnalogInput1 as Value,
143144
Item1.Seconds as Seconds)</scr:Expression>
144145
</Expression>
145146
<Expression xsi:type="MemberSelector">

‎src/main.bonsai‎

Lines changed: 36 additions & 52 deletions
Original file line numberDiff line numberDiff line change
@@ -26,11 +26,12 @@
2626
xmlns:p12="clr-namespace:AllenNeuralDynamics.Core.Design;assembly=AllenNeuralDynamics.Core.Design"
2727
xmlns:bv="clr-namespace:BonVision;assembly=BonVision"
2828
xmlns:p13="clr-namespace:AllenNeuralDynamics.LicketySplit;assembly=AllenNeuralDynamics.LicketySplit"
29-
xmlns:p14="clr-namespace:;assembly=Extensions"
30-
xmlns:p15="clr-namespace:AllenNeuralDynamics.HarpUtils;assembly=AllenNeuralDynamics.HarpUtils"
29+
xmlns:p14="clr-namespace:Harp.Behavior;assembly=Extensions"
30+
xmlns:p15="clr-namespace:;assembly=Extensions"
31+
xmlns:p16="clr-namespace:AllenNeuralDynamics.HarpUtils;assembly=AllenNeuralDynamics.HarpUtils"
3132
xmlns:gui="clr-namespace:Bonsai.Gui;assembly=Bonsai.Gui"
3233
xmlns:wie="clr-namespace:Bonsai.Windows.Input;assembly=Bonsai.Windows.Input"
33-
xmlns:p16="clr-namespace:Bonsai.Vision.Design;assembly=Bonsai.Vision.Design"
34+
xmlns:p17="clr-namespace:Bonsai.Vision.Design;assembly=Bonsai.Vision.Design"
3435
xmlns:zg="clr-namespace:Bonsai.Gui.ZedGraph;assembly=Bonsai.Gui.ZedGraph"
3536
xmlns="https://bonsai-rx.org/2018/workflow">
3637
<Workflow>
@@ -2252,20 +2253,8 @@ Item2.Item3 as LowerThr)]]></Text>
22522253
<Expression xsi:type="beh:Parse">
22532254
<harp:Register xsi:type="beh:TimestampedAnalogData" />
22542255
</Expression>
2255-
<Expression xsi:type="MemberSelector">
2256-
<Selector>Value</Selector>
2257-
</Expression>
2258-
<Expression xsi:type="MemberSelector">
2259-
<Selector>AnalogInput0,AnalogInput1</Selector>
2260-
</Expression>
2261-
<Expression xsi:type="MemberSelector">
2262-
<Selector>Seconds</Selector>
2263-
</Expression>
22642256
<Expression xsi:type="Combinator">
2265-
<Combinator xsi:type="rx:Zip" />
2266-
</Expression>
2267-
<Expression xsi:type="Combinator">
2268-
<Combinator xsi:type="harp:CreateTimestamped" />
2257+
<Combinator xsi:type="p14:AdcToVolt" />
22692258
</Expression>
22702259
<Expression xsi:type="rx:PublishSubject">
22712260
<Name>AnalogInputData</Name>
@@ -2274,12 +2263,7 @@ Item2.Item3 as LowerThr)]]></Text>
22742263
<Edges>
22752264
<Edge From="0" To="1" Label="Source1" />
22762265
<Edge From="1" To="2" Label="Source1" />
2277-
<Edge From="1" To="4" Label="Source1" />
22782266
<Edge From="2" To="3" Label="Source1" />
2279-
<Edge From="3" To="5" Label="Source1" />
2280-
<Edge From="4" To="5" Label="Source2" />
2281-
<Edge From="5" To="6" Label="Source1" />
2282-
<Edge From="6" To="7" Label="Source1" />
22832267
</Edges>
22842268
</Workflow>
22852269
</Expression>
@@ -2312,7 +2296,7 @@ Item2.Item3 as LowerThr)]]></Text>
23122296
</PropertyMappings>
23132297
</Expression>
23142298
<Expression xsi:type="Combinator">
2315-
<Combinator xsi:type="p14:ApplyLoadCellsCalibration" />
2299+
<Combinator xsi:type="p15:ApplyLoadCellsCalibration" />
23162300
</Expression>
23172301
<Expression xsi:type="rx:PublishSubject">
23182302
<Name>CalibratedLoadCellData</Name>
@@ -2681,9 +2665,9 @@ Item2.Item3 as LowerThr)]]></Text>
26812665
</PropertyMappings>
26822666
</Expression>
26832667
<Expression xsi:type="Combinator">
2684-
<Combinator xsi:type="p14:MoveAbsoluteSingleAxis">
2685-
<p14:Axis>Y1</p14:Axis>
2686-
<p14:MessageType>Write</p14:MessageType>
2668+
<Combinator xsi:type="p15:MoveAbsoluteSingleAxis">
2669+
<p15:Axis>Y1</p15:Axis>
2670+
<p15:MessageType>Write</p15:MessageType>
26872671
</Combinator>
26882672
</Expression>
26892673
<Expression xsi:type="MulticastSubject">
@@ -3064,7 +3048,7 @@ Item2.Item3 as LowerThr)]]></Text>
30643048
</PropertyMappings>
30653049
</Expression>
30663050
<Expression xsi:type="Combinator">
3067-
<Combinator xsi:type="p14:ParseAction" />
3051+
<Combinator xsi:type="p15:ParseAction" />
30683052
</Expression>
30693053
<Expression xsi:type="WorkflowOutput" />
30703054
</Nodes>
@@ -3828,9 +3812,9 @@ Item2.Item3 as LowerThr)]]></Text>
38283812
<Combinator xsi:type="rx:WithLatestFrom" />
38293813
</Expression>
38303814
<Expression xsi:type="Combinator">
3831-
<Combinator xsi:type="p15:ModifyMessage">
3832-
<p15:Address xsi:nil="true" />
3833-
<p15:MessageTypeModified xsi:nil="true" />
3815+
<Combinator xsi:type="p16:ModifyMessage">
3816+
<p16:Address xsi:nil="true" />
3817+
<p16:MessageTypeModified xsi:nil="true" />
38343818
</Combinator>
38353819
</Expression>
38363820
<Expression xsi:type="SubscribeSubject">
@@ -3857,9 +3841,9 @@ Item2.Item3 as LowerThr)]]></Text>
38573841
<Combinator xsi:type="rx:WithLatestFrom" />
38583842
</Expression>
38593843
<Expression xsi:type="Combinator">
3860-
<Combinator xsi:type="p15:ModifyMessage">
3861-
<p15:Address xsi:nil="true" />
3862-
<p15:MessageTypeModified xsi:nil="true" />
3844+
<Combinator xsi:type="p16:ModifyMessage">
3845+
<p16:Address xsi:nil="true" />
3846+
<p16:MessageTypeModified xsi:nil="true" />
38633847
</Combinator>
38643848
</Expression>
38653849
<Expression xsi:type="SubscribeSubject">
@@ -3886,9 +3870,9 @@ Item2.Item3 as LowerThr)]]></Text>
38863870
<Combinator xsi:type="rx:WithLatestFrom" />
38873871
</Expression>
38883872
<Expression xsi:type="Combinator">
3889-
<Combinator xsi:type="p15:ModifyMessage">
3890-
<p15:Address xsi:nil="true" />
3891-
<p15:MessageTypeModified xsi:nil="true" />
3873+
<Combinator xsi:type="p16:ModifyMessage">
3874+
<p16:Address xsi:nil="true" />
3875+
<p16:MessageTypeModified xsi:nil="true" />
38923876
</Combinator>
38933877
</Expression>
38943878
<Expression xsi:type="SubscribeSubject">
@@ -3915,9 +3899,9 @@ Item2.Item3 as LowerThr)]]></Text>
39153899
<Combinator xsi:type="rx:WithLatestFrom" />
39163900
</Expression>
39173901
<Expression xsi:type="Combinator">
3918-
<Combinator xsi:type="p15:ModifyMessage">
3919-
<p15:Address xsi:nil="true" />
3920-
<p15:MessageTypeModified xsi:nil="true" />
3902+
<Combinator xsi:type="p16:ModifyMessage">
3903+
<p16:Address xsi:nil="true" />
3904+
<p16:MessageTypeModified xsi:nil="true" />
39213905
</Combinator>
39223906
</Expression>
39233907
<Expression xsi:type="SubscribeSubject">
@@ -3944,9 +3928,9 @@ Item2.Item3 as LowerThr)]]></Text>
39443928
<Combinator xsi:type="rx:WithLatestFrom" />
39453929
</Expression>
39463930
<Expression xsi:type="Combinator">
3947-
<Combinator xsi:type="p15:ModifyMessage">
3948-
<p15:Address xsi:nil="true" />
3949-
<p15:MessageTypeModified xsi:nil="true" />
3931+
<Combinator xsi:type="p16:ModifyMessage">
3932+
<p16:Address xsi:nil="true" />
3933+
<p16:MessageTypeModified xsi:nil="true" />
39503934
</Combinator>
39513935
</Expression>
39523936
<Expression xsi:type="SubscribeSubject">
@@ -3973,9 +3957,9 @@ Item2.Item3 as LowerThr)]]></Text>
39733957
<Combinator xsi:type="rx:WithLatestFrom" />
39743958
</Expression>
39753959
<Expression xsi:type="Combinator">
3976-
<Combinator xsi:type="p15:ModifyMessage">
3977-
<p15:Address xsi:nil="true" />
3978-
<p15:MessageTypeModified xsi:nil="true" />
3960+
<Combinator xsi:type="p16:ModifyMessage">
3961+
<p16:Address xsi:nil="true" />
3962+
<p16:MessageTypeModified xsi:nil="true" />
39793963
</Combinator>
39803964
</Expression>
39813965
<Expression xsi:type="SubscribeSubject">
@@ -4002,9 +3986,9 @@ Item2.Item3 as LowerThr)]]></Text>
40023986
<Combinator xsi:type="rx:WithLatestFrom" />
40033987
</Expression>
40043988
<Expression xsi:type="Combinator">
4005-
<Combinator xsi:type="p15:ModifyMessage">
4006-
<p15:Address xsi:nil="true" />
4007-
<p15:MessageTypeModified xsi:nil="true" />
3989+
<Combinator xsi:type="p16:ModifyMessage">
3990+
<p16:Address xsi:nil="true" />
3991+
<p16:MessageTypeModified xsi:nil="true" />
40083992
</Combinator>
40093993
</Expression>
40103994
<Expression xsi:type="SubscribeSubject">
@@ -4480,8 +4464,8 @@ Item2.Item3 as LowerThr)]]></Text>
44804464
</PropertyMappings>
44814465
</Expression>
44824466
<Expression xsi:type="Combinator">
4483-
<Combinator xsi:type="p14:CopyFile">
4484-
<p14:Overwrite>false</p14:Overwrite>
4467+
<Combinator xsi:type="p15:CopyFile">
4468+
<p15:Overwrite>false</p15:Overwrite>
44854469
</Combinator>
44864470
</Expression>
44874471
</Nodes>
@@ -6009,13 +5993,13 @@ Item2.Item3 as LowerThr)]]></Text>
60095993
<Selector>Item1</Selector>
60105994
</Expression>
60115995
<Expression xsi:type="VisualizerMapping">
6012-
<VisualizerType xsi:type="TypeMapping" TypeArguments="p16:PointVisualizer" />
5996+
<VisualizerType xsi:type="TypeMapping" TypeArguments="p17:PointVisualizer" />
60135997
</Expression>
60145998
<Expression xsi:type="MemberSelector">
60155999
<Selector>Item2</Selector>
60166000
</Expression>
60176001
<Expression xsi:type="VisualizerMapping">
6018-
<VisualizerType xsi:type="TypeMapping" TypeArguments="p16:IplImageVisualizer" />
6002+
<VisualizerType xsi:type="TypeMapping" TypeArguments="p17:IplImageVisualizer" />
60196003
</Expression>
60206004
<Expression xsi:type="SubscribeSubject">
60216005
<Name>CurrentActionVector</Name>
@@ -6442,7 +6426,7 @@ it.Value[7] as Channel7
64426426
</Expression>
64436427
<Expression xsi:type="zg:RollingGraphBuilder">
64446428
<zg:IndexSelector>Seconds</zg:IndexSelector>
6445-
<zg:ValueSelector>Value.Item1,Value.Item2</zg:ValueSelector>
6429+
<zg:ValueSelector>Value.AnalogInput0,Value.AnalogInput1</zg:ValueSelector>
64466430
<zg:SymbolType>None</zg:SymbolType>
64476431
<zg:LineWidth>3</zg:LineWidth>
64486432
<zg:CurveSettings />

0 commit comments

Comments
 (0)