Improve startup logic

AllenNeuralDynamics · Jan 31, 2025 · 31b3e96 · 31b3e96
1 parent 8dfbed0
commit 31b3e96
Show file tree

Hide file tree

Showing 3 changed files with 212 additions and 106 deletions.
diff --git a/bonsai/Bonsai.config b/bonsai/Bonsai.config
@@ -4,9 +4,9 @@
     <Package id="AllenNeuralDynamics.AindBehaviorServices" version="0.8.0" />
     <Package id="AllenNeuralDynamics.AindManipulator" version="0.1.6" />
     <Package id="AllenNeuralDynamics.Core" version="0.3.0" />
-    <Package id="AllenNeuralDynamics.Core.Design" version="0.2.2" />
+    <Package id="AllenNeuralDynamics.Core.Design" version="0.2.3" />
     <Package id="AllenNeuralDynamics.EnvironmentSensor" version="0.2.0" />
-    <Package id="AllenNeuralDynamics.HarpUtils" version="0.1.9" />
+    <Package id="AllenNeuralDynamics.HarpUtils" version="0.2.0" />
     <Package id="AllenNeuralDynamics.LicketySplit" version="0.2.0" />
     <Package id="AllenNeuralDynamics.SniffDetector" version="0.2.0" />
     <Package id="AllenNeuralDynamics.Treadmill" version="0.2.0" />
@@ -17,14 +17,15 @@
     <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" version="2.8.1" />
     <Package id="Bonsai.Editor" version="2.8.5" />
     <Package id="Bonsai.Gui" version="0.1.0" />
     <Package id="Bonsai.Gui.ZedGraph" version="0.1.0" />
     <Package id="Bonsai.Harp" version="3.5.2" />
     <Package id="Bonsai.Harp.Design" version="3.5.0" />
     <Package id="Bonsai.Numerics" version="0.7.0" />
     <Package id="Bonsai.Scripting.Expressions" version="2.8.0" />
+    <Package id="Bonsai.Scripting.Expressions.Design" version="2.8.0" />
     <Package id="Bonsai.Shaders" version="0.26.0" />
     <Package id="Bonsai.Shaders.Design" version="0.26.0" />
     <Package id="Bonsai.Shaders.Rendering" version="0.3.0" />
@@ -91,6 +92,7 @@
     <AssemblyReference assemblyName="Bonsai.Harp.Design" />
     <AssemblyReference assemblyName="Bonsai.Numerics" />
     <AssemblyReference assemblyName="Bonsai.Scripting.Expressions" />
+    <AssemblyReference assemblyName="Bonsai.Scripting.Expressions.Design" />
     <AssemblyReference assemblyName="Bonsai.Shaders" />
     <AssemblyReference assemblyName="Bonsai.Shaders.Design" />
     <AssemblyReference assemblyName="Bonsai.Shaders.Rendering" />
@@ -113,9 +115,9 @@
     <AssemblyLocation assemblyName="AllenNeuralDynamics.AindBehaviorServices" processorArchitecture="MSIL" location="Packages/AllenNeuralDynamics.AindBehaviorServices.0.8.0/lib/net472/AllenNeuralDynamics.AindBehaviorServices.dll" />
     <AssemblyLocation assemblyName="AllenNeuralDynamics.AindManipulator" processorArchitecture="MSIL" location="Packages/AllenNeuralDynamics.AindManipulator.0.1.6/lib/net48/AllenNeuralDynamics.AindManipulator.dll" />
     <AssemblyLocation assemblyName="AllenNeuralDynamics.Core" processorArchitecture="MSIL" location="Packages/AllenNeuralDynamics.Core.0.3.0/lib/net472/AllenNeuralDynamics.Core.dll" />
-    <AssemblyLocation assemblyName="AllenNeuralDynamics.Core.Design" processorArchitecture="MSIL" location="Packages/AllenNeuralDynamics.Core.Design.0.2.2/lib/net472/AllenNeuralDynamics.Core.Design.dll" />
+    <AssemblyLocation assemblyName="AllenNeuralDynamics.Core.Design" processorArchitecture="MSIL" location="Packages/AllenNeuralDynamics.Core.Design.0.2.3/lib/net472/AllenNeuralDynamics.Core.Design.dll" />
     <AssemblyLocation assemblyName="AllenNeuralDynamics.EnvironmentSensor" processorArchitecture="MSIL" location="Packages/AllenNeuralDynamics.EnvironmentSensor.0.2.0/lib/net462/AllenNeuralDynamics.EnvironmentSensor.dll" />
-    <AssemblyLocation assemblyName="AllenNeuralDynamics.HarpUtils" processorArchitecture="MSIL" location="Packages/AllenNeuralDynamics.HarpUtils.0.1.9/lib/net472/AllenNeuralDynamics.HarpUtils.dll" />
+    <AssemblyLocation assemblyName="AllenNeuralDynamics.HarpUtils" processorArchitecture="MSIL" location="Packages/AllenNeuralDynamics.HarpUtils.0.2.0/lib/net472/AllenNeuralDynamics.HarpUtils.dll" />
     <AssemblyLocation assemblyName="AllenNeuralDynamics.LicketySplit" processorArchitecture="MSIL" location="Packages/AllenNeuralDynamics.LicketySplit.0.2.0/lib/net462/AllenNeuralDynamics.LicketySplit.dll" />
     <AssemblyLocation assemblyName="AllenNeuralDynamics.SniffDetector" processorArchitecture="MSIL" location="Packages/AllenNeuralDynamics.SniffDetector.0.2.0/lib/net462/AllenNeuralDynamics.SniffDetector.dll" />
     <AssemblyLocation assemblyName="AllenNeuralDynamics.Treadmill" processorArchitecture="MSIL" location="Packages/AllenNeuralDynamics.Treadmill.0.2.0/lib/net462/AllenNeuralDynamics.Treadmill.dll" />
@@ -126,14 +128,15 @@
     <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" processorArchitecture="MSIL" location="Packages/Bonsai.Dsp.2.8.1/lib/net462/Bonsai.Dsp.dll" />
     <AssemblyLocation assemblyName="Bonsai.Editor" processorArchitecture="MSIL" location="Packages/Bonsai.Editor.2.8.5/lib/net472/Bonsai.Editor.dll" />
     <AssemblyLocation assemblyName="Bonsai.Gui" processorArchitecture="MSIL" location="Packages/Bonsai.Gui.0.1.0/lib/net472/Bonsai.Gui.dll" />
     <AssemblyLocation assemblyName="Bonsai.Gui.ZedGraph" processorArchitecture="MSIL" location="Packages/Bonsai.Gui.ZedGraph.0.1.0/lib/net472/Bonsai.Gui.ZedGraph.dll" />
     <AssemblyLocation assemblyName="Bonsai.Harp" processorArchitecture="MSIL" location="Packages/Bonsai.Harp.3.5.2/lib/net462/Bonsai.Harp.dll" />
     <AssemblyLocation assemblyName="Bonsai.Harp.Design" processorArchitecture="MSIL" location="Packages/Bonsai.Harp.Design.3.5.0/lib/net462/Bonsai.Harp.Design.dll" />
     <AssemblyLocation assemblyName="Bonsai.Numerics" processorArchitecture="MSIL" location="Packages/Bonsai.Numerics.0.7.0/lib/net462/Bonsai.Numerics.dll" />
     <AssemblyLocation assemblyName="Bonsai.Scripting.Expressions" processorArchitecture="MSIL" location="Packages/Bonsai.Scripting.Expressions.2.8.0/lib/net462/Bonsai.Scripting.Expressions.dll" />
+    <AssemblyLocation assemblyName="Bonsai.Scripting.Expressions.Design" processorArchitecture="MSIL" location="Packages/Bonsai.Scripting.Expressions.Design.2.8.0/lib/net462/Bonsai.Scripting.Expressions.Design.dll" />
     <AssemblyLocation assemblyName="Bonsai.Shaders" processorArchitecture="MSIL" location="Packages/Bonsai.Shaders.0.26.0/lib/net462/Bonsai.Shaders.dll" />
     <AssemblyLocation assemblyName="Bonsai.Shaders.Design" processorArchitecture="MSIL" location="Packages/Bonsai.Shaders.Design.0.26.0/lib/net462/Bonsai.Shaders.Design.dll" />
     <AssemblyLocation assemblyName="Bonsai.Shaders.Rendering" processorArchitecture="MSIL" location="Packages/Bonsai.Shaders.Rendering.0.3.0/lib/net462/Bonsai.Shaders.Rendering.dll" />

diff --git a/src/Extensions/LauncherControl.bonsai b/src/Extensions/LauncherControl.bonsai
@@ -1,11 +1,31 @@
 <?xml version="1.0" encoding="utf-8"?>
 <WorkflowBuilder Version="2.8.5"
                  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-                 xmlns:gui="clr-namespace:Bonsai.Gui;assembly=Bonsai.Gui"
                  xmlns:rx="clr-namespace:Bonsai.Reactive;assembly=Bonsai.Core"
+                 xmlns:gui="clr-namespace:Bonsai.Gui;assembly=Bonsai.Gui"
                  xmlns="https://bonsai-rx.org/2018/workflow">
   <Workflow>
     <Nodes>
+      <Expression xsi:type="SubscribeSubject">
+        <Name>StartExperimentToggleButton</Name>
+      </Expression>
+      <Expression xsi:type="Combinator">
+        <Combinator xsi:type="rx:Take">
+          <rx:Count>1</rx:Count>
+        </Combinator>
+      </Expression>
+      <Expression xsi:type="Unit" />
+      <Expression xsi:type="MulticastSubject">
+        <Name>StartLogging</Name>
+      </Expression>
+      <Expression xsi:type="Combinator">
+        <Combinator xsi:type="rx:Delay">
+          <rx:DueTime>PT1S</rx:DueTime>
+        </Combinator>
+      </Expression>
+      <Expression xsi:type="MulticastSubject">
+        <Name>StartExperiment</Name>
+      </Expression>
       <Expression xsi:type="IncludeWorkflow" Path="Extensions\Annotation.bonsai" />
       <Expression xsi:type="VisualizerMapping">
         <VisualizerType xsi:type="TypeMapping" TypeArguments="gui:TableLayoutPanelVisualizer" />
@@ -31,6 +51,14 @@
       <Expression xsi:type="VisualizerMapping">
         <VisualizerType xsi:type="TypeMapping" TypeArguments="gui:ButtonVisualizer" />
       </Expression>
+      <Expression xsi:type="SubscribeSubject">
+        <Name>ExperimentState</Name>
+      </Expression>
+      <Expression xsi:type="PropertyMapping">
+        <PropertyMappings>
+          <Property Name="Enabled" />
+        </PropertyMappings>
+      </Expression>
       <Expression xsi:type="gui:ButtonBuilder">
         <gui:Name>End</gui:Name>
         <gui:Enabled>true</gui:Enabled>
@@ -77,40 +105,32 @@
       <Expression xsi:type="Combinator">
         <Combinator xsi:type="rx:SubscribeWhen" />
       </Expression>
-      <Expression xsi:type="SubscribeSubject">
-        <Name>StartExperimentToggleButton</Name>
-      </Expression>
-      <Expression xsi:type="Combinator">
-        <Combinator xsi:type="rx:Take">
-          <rx:Count>1</rx:Count>
-        </Combinator>
-      </Expression>
-      <Expression xsi:type="Unit" />
-      <Expression xsi:type="MulticastSubject">
-        <Name>StartLogging</Name>
-      </Expression>
     </Nodes>
     <Edges>
       <Edge From="0" To="1" Label="Source1" />
-      <Edge From="1" To="11" Label="Source1" />
+      <Edge From="1" To="2" Label="Source1" />
       <Edge From="2" To="3" 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="7" To="11" Label="Source2" />
+      <Edge From="7" To="19" Label="Source1" />
       <Edge From="8" To="9" Label="Source1" />
       <Edge From="9" To="10" Label="Source1" />
-      <Edge From="10" To="11" Label="Source3" />
+      <Edge From="10" To="11" Label="Source1" />
       <Edge From="11" To="12" Label="Source1" />
-      <Edge From="13" To="14" Label="Source1" />
+      <Edge From="12" To="13" Label="Source1" />
+      <Edge From="13" To="19" Label="Source2" />
       <Edge From="14" To="15" Label="Source1" />
       <Edge From="15" To="16" Label="Source1" />
-      <Edge From="16" To="18" Label="Source1" />
-      <Edge From="17" To="18" Label="Source2" />
+      <Edge From="16" To="17" Label="Source1" />
+      <Edge From="17" To="18" Label="Source1" />
+      <Edge From="18" To="19" Label="Source3" />
       <Edge From="19" To="20" Label="Source1" />
-      <Edge From="20" To="21" Label="Source1" />
       <Edge From="21" To="22" Label="Source1" />
+      <Edge From="22" To="23" Label="Source1" />
+      <Edge From="23" To="24" Label="Source1" />
+      <Edge From="24" To="26" Label="Source1" />
+      <Edge From="25" To="26" Label="Source2" />
     </Edges>
   </Workflow>
 </WorkflowBuilder>