Fix bug with water delivery and add manipulator UI

AllenNeuralDynamics · Feb 3, 2025 · 8297f1d · 8297f1d
1 parent 2207d24
commit 8297f1d
Showing 1 changed file with 41 additions and 21 deletions.
diff --git a/src/main.bonsai b/src/main.bonsai
@@ -504,7 +504,7 @@
                         </Expression>
                         <Expression xsi:type="Combinator">
                           <Combinator xsi:type="rx:RepeatCount">
-                            <rx:Count>20</rx:Count>
+                            <rx:Count>50</rx:Count>
                           </Combinator>
                         </Expression>
                         <Expression xsi:type="Combinator">
@@ -671,6 +671,9 @@
                   <Expression xsi:type="rx:AsyncSubject">
                     <Name>ThisDelay</Name>
                   </Expression>
+                  <Expression xsi:type="MulticastSubject">
+                    <Name>ValveOpenTimeMs</Name>
+                  </Expression>
                   <Expression xsi:type="MulticastSubject">
                     <Name>CurrentDelay</Name>
                   </Expression>
@@ -837,30 +840,31 @@
                   <Edge From="0" To="1" Label="Source1" />
                   <Edge From="1" To="2" Label="Source1" />
                   <Edge From="2" To="3" Label="Source1" />
-                  <Edge From="4" To="5" Label="Source1" />
+                  <Edge From="3" To="4" Label="Source1" />
                   <Edge From="5" To="6" Label="Source1" />
                   <Edge From="6" To="7" Label="Source1" />
-                  <Edge From="8" To="9" Label="Source1" />
+                  <Edge From="7" To="8" Label="Source1" />
                   <Edge From="9" To="10" Label="Source1" />
                   <Edge From="10" To="11" Label="Source1" />
-                  <Edge From="12" To="13" Label="Source1" />
-                  <Edge From="13" To="16" Label="Source1" />
-                  <Edge From="14" To="15" Label="Source1" />
-                  <Edge From="15" To="16" Label="Source2" />
-                  <Edge From="16" To="17" Label="Source1" />
+                  <Edge From="11" To="12" Label="Source1" />
+                  <Edge From="13" To="14" Label="Source1" />
+                  <Edge From="14" To="17" 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" />
-                  <Edge From="20" To="29" Label="Source1" />
-                  <Edge From="21" To="22" Label="Source1" />
+                  <Edge From="20" To="21" Label="Source1" />
+                  <Edge From="21" To="30" Label="Source1" />
                   <Edge From="22" To="23" Label="Source1" />
-                  <Edge From="23" To="29" Label="Source2" />
-                  <Edge From="24" To="25" Label="Source1" />
+                  <Edge From="23" To="24" Label="Source1" />
+                  <Edge From="24" To="30" Label="Source2" />
                   <Edge From="25" To="26" Label="Source1" />
-                  <Edge From="26" To="29" Label="Source3" />
-                  <Edge From="27" To="28" Label="Source1" />
-                  <Edge From="28" To="29" Label="Source4" />
-                  <Edge From="29" To="30" Label="Source1" />
+                  <Edge From="26" To="27" Label="Source1" />
+                  <Edge From="27" To="30" Label="Source3" />
+                  <Edge From="28" To="29" Label="Source1" />
+                  <Edge From="29" To="30" Label="Source4" />
+                  <Edge From="30" To="31" Label="Source1" />
                 </Edges>
               </Workflow>
             </Expression>
@@ -1189,6 +1193,18 @@ Item2 as Weight)</scr:Expression>
       <Expression xsi:type="VisualizerMapping">
         <VisualizerType xsi:type="TypeMapping" TypeArguments="gui:TableLayoutPanelVisualizer" />
       </Expression>
+      <Expression xsi:type="IncludeWorkflow" Path="AllenNeuralDynamics.AindManipulator:AindManipulatorGui.bonsai" />
+      <Expression xsi:type="VisualizerMapping">
+        <VisualizerType xsi:type="TypeMapping" TypeArguments="gui:TableLayoutPanelVisualizer" />
+      </Expression>
+      <Expression xsi:type="gui:TabControlBuilder">
+        <gui:Name>OperationControl</gui:Name>
+        <gui:Enabled>true</gui:Enabled>
+        <gui:Visible>true</gui:Visible>
+      </Expression>
+      <Expression xsi:type="VisualizerMapping">
+        <VisualizerType xsi:type="TypeMapping" TypeArguments="gui:TabControlVisualizer" />
+      </Expression>
       <Expression xsi:type="GroupWorkflow">
         <Name>HardwareShortcuts</Name>
         <Workflow>
@@ -1318,14 +1334,18 @@ Item2 as Weight)</scr:Expression>
       <Edge From="9" To="11" Label="Source1" />
       <Edge From="10" To="11" Label="Source2" />
       <Edge From="12" To="13" Label="Source1" />
-      <Edge From="13" To="18" Label="Source1" />
+      <Edge From="13" To="22" Label="Source1" />
       <Edge From="14" To="15" Label="Source1" />
-      <Edge From="15" To="18" Label="Source2" />
+      <Edge From="15" To="18" Label="Source1" />
       <Edge From="16" To="17" Label="Source1" />
-      <Edge From="17" To="18" Label="Source3" />
-      <Edge From="19" To="20" Label="Source1" />
+      <Edge From="17" To="18" Label="Source2" />
+      <Edge From="18" To="19" Label="Source1" />
+      <Edge From="19" To="22" Label="Source2" />
       <Edge From="20" To="21" Label="Source1" />
-      <Edge From="21" To="22" Label="Source1" />
+      <Edge From="21" To="22" Label="Source3" />
+      <Edge From="23" To="24" Label="Source1" />
+      <Edge From="24" To="25" Label="Source1" />
+      <Edge From="25" To="26" Label="Source1" />
     </Edges>
   </Workflow>
 </WorkflowBuilder>