Merge pull request #174 from SainsburyWellcomeCentre/issue-173

Add heartbeat event stream to synchronizer sources
SainsburyWellcomeCentre · Oct 27, 2023 · 5c05088 · 5c05088
2 parents baa64fb + 80841f5
commit 5c05088
Show file tree

Hide file tree

Showing 3 changed files with 33 additions and 1 deletion.
diff --git a/src/Aeon.Acquisition/Aeon.Acquisition.csproj b/src/Aeon.Acquisition/Aeon.Acquisition.csproj
@@ -6,7 +6,7 @@
     <PackageTags>Bonsai Rx Project Aeon Acquisition</PackageTags>
     <TargetFramework>net472</TargetFramework>
     <VersionPrefix>0.5.0</VersionPrefix>
-    <VersionSuffix>build231010</VersionSuffix>
+    <VersionSuffix>build231011</VersionSuffix>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/src/Aeon.Acquisition/ClockSynchronizer.bonsai b/src/Aeon.Acquisition/ClockSynchronizer.bonsai
@@ -32,6 +32,19 @@
       <Expression xsi:type="rx:PublishSubject">
         <Name>SynchronizerEvents</Name>
       </Expression>
+      <Expression xsi:type="Combinator">
+        <Combinator xsi:type="harp:FilterMessageType">
+          <harp:FilterType>Include</harp:FilterType>
+          <harp:MessageType>Event</harp:MessageType>
+        </Combinator>
+      </Expression>
+      <Expression xsi:type="harp:FilterRegister">
+        <harp:FilterType>Include</harp:FilterType>
+        <harp:Register xsi:type="harp:TimestampSeconds" />
+      </Expression>
+      <Expression xsi:type="rx:PublishSubject">
+        <Name>Heartbeats</Name>
+      </Expression>
       <Expression xsi:type="WorkflowOutput" />
     </Nodes>
     <Edges>
@@ -40,6 +53,9 @@
       <Edge From="2" To="3" Label="Source2" />
       <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="8" Label="Source1" />
     </Edges>
   </Workflow>
 </WorkflowBuilder>
diff --git a/src/Aeon.Acquisition/TimestampGenerator.bonsai b/src/Aeon.Acquisition/TimestampGenerator.bonsai
@@ -32,6 +32,19 @@
       <Expression xsi:type="rx:PublishSubject">
         <Name>SynchronizerEvents</Name>
       </Expression>
+      <Expression xsi:type="Combinator">
+        <Combinator xsi:type="harp:FilterMessageType">
+          <harp:FilterType>Include</harp:FilterType>
+          <harp:MessageType>Event</harp:MessageType>
+        </Combinator>
+      </Expression>
+      <Expression xsi:type="harp:FilterRegister">
+        <harp:FilterType>Include</harp:FilterType>
+        <harp:Register xsi:type="harp:TimestampSeconds" />
+      </Expression>
+      <Expression xsi:type="rx:PublishSubject">
+        <Name>Heartbeats</Name>
+      </Expression>
       <Expression xsi:type="WorkflowOutput" />
     </Nodes>
     <Edges>
@@ -40,6 +53,9 @@
       <Edge From="2" To="3" Label="Source2" />
       <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="8" Label="Source1" />
     </Edges>
   </Workflow>
 </WorkflowBuilder>