Address Span Issues (#21)

* Updated to trigger start time based on change in Trigger channel. * Changed start time to set based on change in trigger if file was previously opened. Also updated size to compute an estimated file size based on how much data was being written to the file.
ni · Mar 27, 2020 · 7b09c2a · 7b09c2a
1 parent 6714020
commit 7b09c2a
Show file tree

Hide file tree

Showing 19 changed files with 27 additions and 2 deletions.
diff --git a/Source/Embedded Data Logger Custom Device.lvproj b/Source/Embedded Data Logger Custom Device.lvproj
@@ -370,7 +370,7 @@
 				<Item Name="Build Path - Traditional__ogtk__jki_vi_tester.vi" Type="VI" URL="/&lt;vilib&gt;/addons/_JKI Toolkits/VI Tester/_support/Support.llb/Build Path - Traditional__ogtk__jki_vi_tester.vi"/>
 				<Item Name="Build Path__ogtk__jki_vi_tester.vi" Type="VI" URL="/&lt;vilib&gt;/addons/_JKI Toolkits/VI Tester/_support/Support.llb/Build Path__ogtk__jki_vi_tester.vi"/>
 				<Item Name="Get LV Class Path.vi" Type="VI" URL="/&lt;vilib&gt;/Utility/LVClass/Get LV Class Path.vi"/>
-				<Item Name="NI_VS Workspace ExecutionAPI.lvlib" Type="Library" URL="/&lt;vilib&gt;/NI Veristand/Execution/Workspace/NI_VS Workspace ExecutionAPI.lvlib"/>
+				<Item Name="NI_VS Workspace ExecutionAPI.lvlib" Type="Library" URL="/&lt;vilib&gt;/NI VeriStand/Execution/Workspace/NI_VS Workspace ExecutionAPI.lvlib"/>
 				<Item Name="NI_LVConfig.lvlib" Type="Library" URL="/&lt;vilib&gt;/Utility/config.llb/NI_LVConfig.lvlib"/>
 				<Item Name="MergeError.vi" Type="VI" URL="/&lt;vilib&gt;/NI Veristand/Execution/Shared/MergeError.vi"/>
 				<Item Name="nisyscfg.lvlib" Type="Library" URL="/&lt;vilib&gt;/nisyscfg/nisyscfg.lvlib"/>
@@ -388,6 +388,14 @@
 				<Item Name="UnpackedFlatVectorToMatrix.vi" Type="VI" URL="/&lt;vilib&gt;/NI Veristand/Execution/Shared/UnpackedFlatVectorToMatrix.vi"/>
 				<Item Name="PackedMatrixToFlatVector.vi" Type="VI" URL="/&lt;vilib&gt;/NI Veristand/Execution/Shared/PackedMatrixToFlatVector.vi"/>
 				<Item Name="subTimeDelay.vi" Type="VI" URL="/&lt;vilib&gt;/express/express execution control/TimeDelayBlock.llb/subTimeDelay.vi"/>
+				<Item Name="Get Refnum Type Enum from Data__ogtk__jki_vi_tester.vi" Type="VI" URL="/&lt;vilib&gt;/addons/_JKI Toolkits/VI Tester/_support/Support.llb/Get Refnum Type Enum from Data__ogtk__jki_vi_tester.vi"/>
+				<Item Name="Refnum Subtype Enum__ogtk__jki_vi_tester.ctl" Type="VI" URL="/&lt;vilib&gt;/addons/_JKI Toolkits/VI Tester/_support/Support.llb/Refnum Subtype Enum__ogtk__jki_vi_tester.ctl"/>
+				<Item Name="Get Refnum Type Enum from TD__ogtk__jki_vi_tester.vi" Type="VI" URL="/&lt;vilib&gt;/addons/_JKI Toolkits/VI Tester/_support/Support.llb/Get Refnum Type Enum from TD__ogtk__jki_vi_tester.vi"/>
+				<Item Name="Get Waveform Type Enum from Data__ogtk__jki_vi_tester.vi" Type="VI" URL="/&lt;vilib&gt;/addons/_JKI Toolkits/VI Tester/_support/Support.llb/Get Waveform Type Enum from Data__ogtk__jki_vi_tester.vi"/>
+				<Item Name="Waveform Subtype Enum__ogtk__jki_vi_tester.ctl" Type="VI" URL="/&lt;vilib&gt;/addons/_JKI Toolkits/VI Tester/_support/Support.llb/Waveform Subtype Enum__ogtk__jki_vi_tester.ctl"/>
+				<Item Name="Get Waveform Type Enum from TD__ogtk__jki_vi_tester.vi" Type="VI" URL="/&lt;vilib&gt;/addons/_JKI Toolkits/VI Tester/_support/Support.llb/Get Waveform Type Enum from TD__ogtk__jki_vi_tester.vi"/>
+				<Item Name="Resolve Timestamp Format__ogtk__jki_vi_tester.vi" Type="VI" URL="/&lt;vilib&gt;/addons/_JKI Toolkits/VI Tester/_support/Support.llb/Resolve Timestamp Format__ogtk__jki_vi_tester.vi"/>
+				<Item Name="NI_AALBase.lvlib" Type="Library" URL="/&lt;vilib&gt;/Analysis/NI_AALBase.lvlib"/>
 			</Item>
 			<Item Name="user.lib" Type="Folder">
 				<Item Name="Append Path to Root if Relative - Scalar__ogtk.vi" Type="VI" URL="/&lt;userlib&gt;/_OpenG.lib/file/file.llb/Append Path to Root if Relative - Scalar__ogtk.vi"/>
@@ -431,6 +439,9 @@
 				<Item Name="Build Path - File Names Array - path__ogtk.vi" Type="VI" URL="/&lt;userlib&gt;/_OpenG.lib/file/file.llb/Build Path - File Names Array - path__ogtk.vi"/>
 				<Item Name="Build Path - File Names and Paths Arrays - path__ogtk.vi" Type="VI" URL="/&lt;userlib&gt;/_OpenG.lib/file/file.llb/Build Path - File Names and Paths Arrays - path__ogtk.vi"/>
 				<Item Name="Current VIs Parent Directory__ogtk.vi" Type="VI" URL="/&lt;userlib&gt;/_OpenG.lib/file/file.llb/Current VIs Parent Directory__ogtk.vi"/>
+				<Item Name="File Exists__ogtk.vi" Type="VI" URL="/&lt;userlib&gt;/_OpenG.lib/file/file.llb/File Exists__ogtk.vi"/>
+				<Item Name="File Exists - Scalar__ogtk.vi" Type="VI" URL="/&lt;userlib&gt;/_OpenG.lib/file/file.llb/File Exists - Scalar__ogtk.vi"/>
+				<Item Name="File Exists - Array__ogtk.vi" Type="VI" URL="/&lt;userlib&gt;/_OpenG.lib/file/file.llb/File Exists - Array__ogtk.vi"/>
 			</Item>
 			<Item Name="NationalInstruments.VeriStand.SystemStorage" Type="Document" URL="NationalInstruments.VeriStand.SystemStorage">
 				<Property Name="NI.PreserveRelativePath" Type="Bool">true</Property>
@@ -457,6 +468,8 @@
 			<Item Name="NationalInstruments.VeriStand.XMLReader" Type="Document" URL="NationalInstruments.VeriStand.XMLReader">
 				<Property Name="NI.PreserveRelativePath" Type="Bool">true</Property>
 			</Item>
+			<Item Name="VeriStandTestCase.lvclass" Type="LVClass" URL="../../../niveristand-custom-device-testing-tools/VeriStandTestCase/VeriStandTestCase.lvclass"/>
+			<Item Name="lvanlys.dll" Type="Document" URL="/&lt;resource&gt;/lvanlys.dll"/>
 		</Item>
 		<Item Name="Build Specifications" Type="Build">
 			<Item Name="Configuration Debug" Type="Source Distribution">

diff --git a/Source/Engine/Add to Flushed Data Size.vi b/Source/Engine/Add to Flushed Data Size.vi
diff --git a/Source/Engine/Asynchronous Logging Loop.vi b/Source/Engine/Asynchronous Logging Loop.vi
diff --git a/Source/Engine/Compute if Should Span.vi b/Source/Engine/Compute if Should Span.vi
diff --git a/Source/Engine/Embedded Data Logger Engine.lvlib b/Source/Engine/Embedded Data Logger Engine.lvlib
@@ -11,6 +11,7 @@
 			<Item Name="Launch Asynchronous Logging Loop.vi" Type="VI" URL="../Launch Asynchronous Logging Loop.vi"/>
 		</Item>
 		<Item Name="Run" Type="Folder">
+			<Item Name="Add to Flushed Data Size.vi" Type="VI" URL="../Add to Flushed Data Size.vi"/>
 			<Item Name="Build Data Log File Path.vi" Type="VI" URL="../Build Data Log File Path.vi"/>
 			<Item Name="Compute if Should Span.vi" Type="VI" URL="../Compute if Should Span.vi"/>
 			<Item Name="Flush Close Archive File.vi" Type="VI" URL="../Flush Close Archive File.vi"/>
@@ -23,6 +24,8 @@
 			<Item Name="Sample File Data.vi" Type="VI" URL="../Sample File Data.vi"/>
 			<Item Name="Sample Group Data.vi" Type="VI" URL="../Sample Group Data.vi"/>
 			<Item Name="Set Data in Group Buffer.vi" Type="VI" URL="../Set Data in Group Buffer.vi"/>
+			<Item Name="Update Log Start Time if New Trigger.vi" Type="VI" URL="../Update Log Start Time if New Trigger.vi"/>
+			<Item Name="Zero Flushed Data Totals.vi" Type="VI" URL="../Zero Flushed Data Totals.vi"/>
 		</Item>
 		<Item Name="Shut Down" Type="Folder"/>
 		<Item Name="RT Driver VI.vi" Type="VI" URL="../RT Driver VI.vi"/>

diff --git a/Source/Engine/File Logging Specification.ctl b/Source/Engine/File Logging Specification.ctl
diff --git a/Source/Engine/Flush Close Archive File.vi b/Source/Engine/Flush Close Archive File.vi
diff --git a/Source/Engine/Flush Group Buffer.vi b/Source/Engine/Flush Group Buffer.vi
diff --git a/Source/Engine/Get Data Log File Settings.vi b/Source/Engine/Get Data Log File Settings.vi
diff --git a/Source/Engine/Group Buffer Data.ctl b/Source/Engine/Group Buffer Data.ctl
diff --git a/Source/Engine/Group Logging Specification.ctl b/Source/Engine/Group Logging Specification.ctl
diff --git a/Source/Engine/Initialize Logging Data.vi b/Source/Engine/Initialize Logging Data.vi
diff --git a/Source/Engine/Open Data Log File.vi b/Source/Engine/Open Data Log File.vi
diff --git a/Source/Engine/Update Log Start Time if New Trigger.vi b/Source/Engine/Update Log Start Time if New Trigger.vi
diff --git a/Source/Engine/Zero Flushed Data Totals.vi b/Source/Engine/Zero Flushed Data Totals.vi
diff --git a/Source/Tests/System/Windows System Tests/Assert Log File Size.vi b/Source/Tests/System/Windows System Tests/Assert Log File Size.vi
diff --git a/Source/Tests/System/Windows System Tests/Embedded Data Logger Windows System Tests.lvclass b/Source/Tests/System/Windows System Tests/Embedded Data Logger Windows System Tests.lvclass
diff --git a/Source/Tests/System/Windows System Tests/Wait for Files.vi b/Source/Tests/System/Windows System Tests/Wait for Files.vi
diff --git a/Source/Tests/System/Windows System Tests/test Log Span Size.vi b/Source/Tests/System/Windows System Tests/test Log Span Size.vi