Skip to content

Commit

Permalink
Merge pull request #42 from AllenNeuralDynamics/hotfix-ensure-initial…
Browse files Browse the repository at this point in the history 
…-configuration

Ensure initial AIND motor configuration is correctly handled
  • Loading branch information
@bruno-f-cruz
bruno-f-cruz authored Jun 11, 2024
2 parents bb888de + be1c4af commit 0ae53aa
Show file tree
Hide file tree
Showing 2 changed files with 62 additions and 34 deletions.
94 changes: 61 additions & 33 deletions src/AllenNeuralDynamics.AindManipulator/AindManipulator.bonsai
View file
Original file line number Diff line number Diff line change
Expand Up @@ -357,16 +357,6 @@
<rx:Count>1</rx:Count>
</Combinator>
</Expression>
<Expression xsi:type="Combinator">
<Combinator xsi:type="ByteProperty">
<Value>1</Value>
</Combinator>
</Expression>
<Expression xsi:type="Combinator">
<Combinator xsi:type="rx:Take">
<rx:Count>1</rx:Count>
</Combinator>
</Expression>
<Expression xsi:type="SubscribeSubject">
<Name>Settings</Name>
</Expression>
Expand All @@ -379,17 +369,59 @@
<Expression xsi:type="MemberSelector">
<Selector>Axis</Selector>
</Expression>
<Expression xsi:type="scr:ExpressionTransform">
<scr:Name>ToByte - 1</scr:Name>
<scr:Expression>byte(it) - 1</scr:Expression>
</Expression>
<Expression xsi:type="PropertyMapping">
<PropertyMappings>
<Property Name="Value" />
</PropertyMappings>
</Expression>
<Expression xsi:type="LeftShift">
<Value>3</Value>
<Expression xsi:type="rx:SelectMany">
<Name>LeftShift</Name>
<Workflow>
<Nodes>
<Expression xsi:type="WorkflowInput">
<Name>Source1</Name>
</Expression>
<Expression xsi:type="Combinator">
<Combinator xsi:type="rx:Take">
<rx:Count>1</rx:Count>
</Combinator>
</Expression>
<Expression xsi:type="rx:AsyncSubject">
<Name>Axis</Name>
</Expression>
<Expression xsi:type="Combinator">
<Combinator xsi:type="ByteProperty">
<Value>1</Value>
</Combinator>
</Expression>
<Expression xsi:type="Combinator">
<Combinator xsi:type="rx:Take">
<rx:Count>1</rx:Count>
</Combinator>
</Expression>
<Expression xsi:type="SubscribeSubject">
<Name>Axis</Name>
</Expression>
<Expression xsi:type="scr:ExpressionTransform">
<scr:Name>ToByte - 1</scr:Name>
<scr:Expression>byte(it - 1)</scr:Expression>
</Expression>
<Expression xsi:type="PropertyMapping">
<PropertyMappings>
<Property Name="Value" />
</PropertyMappings>
</Expression>
<Expression xsi:type="LeftShift">
<Value>0</Value>
</Expression>
<Expression xsi:type="WorkflowOutput" />
</Nodes>
<Edges>
<Edge From="0" To="1" Label="Source1" />
<Edge From="1" To="2" Label="Source1" />
<Edge From="3" To="4" Label="Source1" />
<Edge From="4" To="8" Label="Source1" />
<Edge From="5" To="6" Label="Source1" />
<Edge From="6" To="7" Label="Source1" />
<Edge From="7" To="8" Label="Source2" />
<Edge From="8" To="9" Label="Source1" />
</Edges>
</Workflow>
</Expression>
<Expression xsi:type="Combinator">
<Combinator xsi:type="rx:Merge" />
Expand Down Expand Up @@ -422,26 +454,22 @@
</Nodes>
<Edges>
<Edge From="0" To="1" Label="Source1" />
<Edge From="1" To="11" Label="Source1" />
<Edge From="1" To="7" Label="Source1" />
<Edge From="2" To="3" Label="Source1" />
<Edge From="3" To="10" Label="Source1" />
<Edge From="3" To="4" Label="Source1" />
<Edge From="4" To="5" Label="Source1" />
<Edge From="5" To="6" Label="Source1" />
<Edge From="6" To="7" Label="Source1" />
<Edge From="6" To="7" Label="Source2" />
<Edge From="7" To="8" Label="Source1" />
<Edge From="8" To="9" Label="Source1" />
<Edge From="9" To="10" Label="Source2" />
<Edge From="10" To="11" Label="Source2" />
<Edge From="9" To="10" Label="Source1" />
<Edge From="9" To="11" Label="Source1" />
<Edge From="10" To="13" Label="Source1" />
<Edge From="11" To="12" Label="Source1" />
<Edge From="12" To="13" Label="Source1" />
<Edge From="12" To="13" Label="Source2" />
<Edge From="13" To="14" Label="Source1" />
<Edge From="13" To="15" Label="Source1" />
<Edge From="14" To="17" Label="Source1" />
<Edge From="14" To="15" Label="Source1" />
<Edge From="15" To="16" Label="Source1" />
<Edge From="16" To="17" Label="Source2" />
<Edge From="17" To="18" Label="Source1" />
<Edge From="18" To="19" Label="Source1" />
<Edge From="19" To="20" Label="Source1" />
</Edges>
</Workflow>
</Expression>
Expand Down
2 changes: 1 addition & 1 deletion src/AllenNeuralDynamics.AindManipulator/AllenNeuralDynamics.AindManipulator.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
<PackageTags>Bonsai Rx Manipulator AllenNeuralDynamics</PackageTags>
<TargetFramework>net480</TargetFramework>
<Features>strict</Features>
<Version>0.1.0-preview2024061102</Version>
<Version>0.1.0-preview2024061103</Version>
</PropertyGroup>

<ItemGroup>
Expand Down

0 comments on commit 0ae53aa

Please sign in to comment.