Skip to content

Commit

Permalink
Merge branch 'feature/removeasync' into develop
Browse files Browse the repository at this point in the history
Conflicts:
	source/Configuration Editor/Classes/Module editor node/CleanUpNode.vi
  • Loading branch information
Daniel Smith committed Oct 15, 2014
2 parents 5d02355 + ab4d41d commit a877e62
Show file tree
Hide file tree
Showing 91 changed files with 22 additions and 578 deletions.
Binary file not shown.
Original file line number Diff line number Diff line change
Expand Up @@ -122,7 +122,6 @@
<Item Name="VariantType.lvlib" Type="Library" URL="/&lt;vilib&gt;/Utility/VariantDataType/VariantType.lvlib"/>
<Item Name="whitespace.ctl" Type="VI" URL="/&lt;vilib&gt;/Utility/error.llb/whitespace.ctl"/>
</Item>
<Item Name="asynchronous execution module configuration.lvclass" Type="LVClass" URL="../../../../../asynchronous execution module/configuration/asynchronous execution module configuration.lvclass"/>
<Item Name="Channel Run Time Mapping Info.ctl" Type="VI" URL="../../../../../Utilities/Cluster to Tag Bus Scripts/Channel Run Time Mapping Info.ctl"/>
<Item Name="Index to cluster.vi" Type="VI" URL="../../../../../Utilities/Cluster to Tag Bus Scripts/Index to cluster.vi"/>
<Item Name="module information.ctl" Type="VI" URL="../../../../../Configuration Editor/Classes/Engine Mappings/module information.ctl"/>
Expand Down
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.

This file was deleted.

Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file modified source/Configuration Editor/Classes/Engine Parent/EditOptions.vi
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.

Large diffs are not rendered by default.

Binary file not shown.
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@
<Item Name="EngineTags.lvclass" Type="LVClass" URL="../Classes/EngineTags/EngineTags.lvclass"/>
</Item>
<Item Name="Module Editor Nodes" Type="Folder">
<Item Name="Asynchronous Module Editor Node.lvclass" Type="LVClass" URL="../Classes/Asynchronous Component Editor Node/Asynchronous Module Editor Node.lvclass"/>
<Item Name="module editor node.lvclass" Type="LVClass" URL="../Classes/Module editor node/module editor node.lvclass"/>
</Item>
<Item Name="Parent Node" Type="Folder">
Expand Down
18 changes: 5 additions & 13 deletions source/Tag Bus Data Framework.vipb
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<VI_Package_Builder_Settings Version="0.6" Created_Date="2014-07-23 19:04:50" Modified_Date="2014-10-07 14:16:12" Creator="Daniel" Comments="" ID="96ab4d1c776ac901028348d3f9db53c9">
<VI_Package_Builder_Settings Version="0.6" Created_Date="2014-07-23 19:04:50" Modified_Date="2014-10-10 18:08:53" Creator="Daniel" Comments="" ID="ae0dca18ed466e1c6c7ddc25c80ac80f">
<Library_General_Settings>
<Package_File_Name>ni_lib_dataeng</Package_File_Name>
<Library_Version>1.1.1.4</Library_Version>
<Library_Version>1.2.3.10</Library_Version>
<Auto_Increment_Version>false</Auto_Increment_Version>
<Library_Source_Folder>.</Library_Source_Folder>
<Library_Output_Folder>..\..\releases\core</Library_Output_Folder>
Expand All @@ -17,7 +17,7 @@
</Library_General_Settings>
<Advanced_Settings>
<Package_Dependencies>
<Additional_External_Dependencies>ni_lib_config_editor &gt;=1.2.0.29</Additional_External_Dependencies>
<Additional_External_Dependencies>ni_lib_config_editor &gt;=1.2.1.31</Additional_External_Dependencies>
<Additional_External_Dependencies>ni_lib_execsys &gt;=1.0.0.20</Additional_External_Dependencies>
<Additional_External_Dependencies>ni_lib_tbm &gt;=1.0.4.48</Additional_External_Dependencies>
</Package_Dependencies>
Expand All @@ -36,7 +36,7 @@
<Copyright/>
<Packager>NI Systems Engineering</Packager>
<URL>https://github.com/TBDFramework/TBDCore</URL>
<Release_Notes>minor bug fixes to fixed channel template, merge to/from string fixes with removal of unnecessary script functionality</Release_Notes>
<Release_Notes>improvements to script tool</Release_Notes>
</Description>
<Destinations>
<Toolkit_VIs>
Expand Down Expand Up @@ -163,11 +163,6 @@
<Password/>
<Locked_Only>true</Locked_Only>
</Password_Overrides>
<Password_Overrides>
<Path>asynchronous execution module</Path>
<Password/>
<Locked_Only>true</Locked_Only>
</Password_Overrides>
<Password_Overrides>
<Path>Configuration Editor</Path>
<Password/>
Expand All @@ -181,9 +176,6 @@
<Exclusions>
<Path>pldev.lvproj</Path>
</Exclusions>
<Exclusions>
<Path>asynchronous execution module/tests</Path>
</Exclusions>
<Exclusions>
<Path>pldevnosample.lvproj</Path>
</Exclusions>
Expand Down Expand Up @@ -470,7 +462,7 @@
<Path>Framework Configuration Classes\platypus configuration\load runtime from configuration.vi</Path>
<VI_Title/>
</Items_Data>
<GUID>0374ED5D452EE8B782B9DDF80D0DF6EF</GUID>
<GUID>8D754D93BB344D146D953452B052B8F5</GUID>
</Functions_Palette_Data>
</Library_Palette_Definition>
</VI_Package_Builder_Settings>
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.

This file was deleted.

Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.

This file was deleted.

Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
10 changes: 0 additions & 10 deletions source/asynchronous execution module/tests/async tests.lvlib

This file was deleted.

Binary file not shown.
Binary file not shown.
Binary file not shown.
22 changes: 7 additions & 15 deletions source/pldev.lvproj
Original file line number Diff line number Diff line change
Expand Up @@ -28,14 +28,11 @@
<Item Name="PL_Target Configuration.lvclass" Type="LVClass" URL="../Framework Configuration Classes/target configuration/PL_Target Configuration.lvclass"/>
<Item Name="PLConfigurationSerializer.lvlib" Type="Library" URL="../Framework Configuration Classes/platypus configuration/PLConfigurationSerializer.lvlib"/>
<Item Name="PL_class cache.lvlib" Type="Library" URL="../Framework Configuration Classes/class cache/PL_class cache.lvlib"/>
<Item Name="asynchronous execution module configuration.lvclass" Type="LVClass" URL="../asynchronous execution module/configuration/asynchronous execution module configuration.lvclass"/>
<Item Name="asynchronous execution module runtime.lvclass" Type="LVClass" URL="../asynchronous execution module/runtime/asynchronous execution module runtime.lvclass"/>
<Item Name="PL Framework Configuration Tool.lvlib" Type="Library" URL="../Configuration Editor/PL Framework Configuration Tool.lvlib"/>
<Item Name="PL_Target Runtime.lvclass" Type="LVClass" URL="../Framework Configuration Classes/target runtime/PL_Target Runtime.lvclass"/>
</Item>
<Item Name="tests" Type="Folder">
<Item Name="configuration tests.lvlib" Type="Library" URL="../tests/configuration tests.lvlib"/>
<Item Name="async tests.lvlib" Type="Library" URL="../asynchronous execution module/tests/async tests.lvlib"/>
</Item>
<Item Name="Core Targets" Type="Folder">
<Item Name="PLTarget cRIO.lvclass" Type="LVClass" URL="../core targets/cRIO/PLTarget cRIO.lvclass"/>
Expand Down Expand Up @@ -241,16 +238,7 @@
<Item Name="Set Cursor (Icon Pict).vi" Type="VI" URL="/&lt;vilib&gt;/Utility/cursorutil.llb/Set Cursor (Icon Pict).vi"/>
<Item Name="Unset Busy.vi" Type="VI" URL="/&lt;vilib&gt;/Utility/cursorutil.llb/Unset Busy.vi"/>
<Item Name="Check if File or Folder Exists.vi" Type="VI" URL="/&lt;vilib&gt;/Utility/libraryn.llb/Check if File or Folder Exists.vi"/>
<Item Name="Read From Spreadsheet File.vi" Type="VI" URL="/&lt;vilib&gt;/Utility/file.llb/Read From Spreadsheet File.vi"/>
<Item Name="Read From Spreadsheet File (DBL).vi" Type="VI" URL="/&lt;vilib&gt;/Utility/file.llb/Read From Spreadsheet File (DBL).vi"/>
<Item Name="Read Lines From File.vi" Type="VI" URL="/&lt;vilib&gt;/Utility/file.llb/Read Lines From File.vi"/>
<Item Name="Open File+.vi" Type="VI" URL="/&lt;vilib&gt;/Utility/file.llb/Open File+.vi"/>
<Item Name="Read File+ (string).vi" Type="VI" URL="/&lt;vilib&gt;/Utility/file.llb/Read File+ (string).vi"/>
<Item Name="compatReadText.vi" Type="VI" URL="/&lt;vilib&gt;/_oldvers/_oldvers.llb/compatReadText.vi"/>
<Item Name="Close File+.vi" Type="VI" URL="/&lt;vilib&gt;/Utility/file.llb/Close File+.vi"/>
<Item Name="Find First Error.vi" Type="VI" URL="/&lt;vilib&gt;/Utility/error.llb/Find First Error.vi"/>
<Item Name="Read From Spreadsheet File (I64).vi" Type="VI" URL="/&lt;vilib&gt;/Utility/file.llb/Read From Spreadsheet File (I64).vi"/>
<Item Name="Read From Spreadsheet File (string).vi" Type="VI" URL="/&lt;vilib&gt;/Utility/file.llb/Read From Spreadsheet File (string).vi"/>
<Item Name="High Resolution Relative Seconds.vi" Type="VI" URL="/&lt;vilib&gt;/Utility/High Resolution Relative Seconds.vi"/>
<Item Name="Dflt Data Dir.vi" Type="VI" URL="/&lt;vilib&gt;/Utility/file.llb/Dflt Data Dir.vi"/>
<Item Name="Simple Error Handler.vi" Type="VI" URL="/&lt;vilib&gt;/Utility/error.llb/Simple Error Handler.vi"/>
Expand Down Expand Up @@ -352,10 +340,14 @@
<Item Name="Close Create Project Progress Bar.vi" Type="VI" URL="/&lt;resource&gt;/dialog/NewProjectWizard/Close Create Project Progress Bar.vi"/>
<Item Name="Delete Project Destination on Error.vi" Type="VI" URL="/&lt;resource&gt;/dialog/NewProjectWizard/Delete Project Destination on Error.vi"/>
<Item Name="module information.ctl" Type="VI" URL="../Configuration Editor/Classes/Engine Mappings/module information.ctl"/>
<Item Name="TRef FinderCallback.vi" Type="VI" URL="/&lt;vilib&gt;/Utility/traverseref.llb/TRef FinderCallback.vi"/>
<Item Name="Channel Run Time Mapping Info.ctl" Type="VI" URL="../Utilities/Cluster to Tag Bus Scripts/Channel Run Time Mapping Info.ctl"/>
<Item Name="Index to cluster.vi" Type="VI" URL="../Utilities/Cluster to Tag Bus Scripts/Index to cluster.vi"/>
<Item Name="Asynchronous Module Editor Node.lvclass" Type="LVClass" URL="../Configuration Editor/Classes/Asynchronous Component Editor Node/Asynchronous Module Editor Node.lvclass"/>
<Item Name="niFpgaWaitOnOcc.vi" Type="VI" URL="/&lt;vilib&gt;/rvi/interface/common/niFpgaWaitOnOcc.vi"/>
<Item Name="niLvFpga_Close_Dynamic.vi" Type="VI" URL="/&lt;vilib&gt;/FPGAPlugInAG/Dynamic/niLvFpga_Close_Dynamic.vi"/>
<Item Name="nirio_resource_hc.ctl" Type="VI" URL="/&lt;vilib&gt;/userdefined/High Color/nirio_resource_hc.ctl"/>
<Item Name="TRef FinderCallback.vi" Type="VI" URL="/&lt;vilib&gt;/Utility/traverseref.llb/TRef FinderCallback.vi"/>
<Item Name="asynchronous execution module configuration.lvclass" Type="LVClass" URL="../asynchronous execution module/configuration/asynchronous execution module configuration.lvclass"/>
</Item>
<Item Name="Build Specifications" Type="Build">
<Item Name="configurator" Type="EXE">
Expand Down Expand Up @@ -399,7 +391,7 @@
<Property Name="Source[10].sourceInclusion" Type="Str">Include</Property>
<Property Name="Source[10].type" Type="Str">Library</Property>
<Property Name="Source[11].destinationIndex" Type="Int">0</Property>
<Property Name="Source[11].itemID" Type="Ref">/My Computer/Config Classes/asynchronous execution module runtime.lvclass</Property>
<Property Name="Source[11].itemID" Type="Ref"></Property>
<Property Name="Source[11].sourceInclusion" Type="Str">Include</Property>
<Property Name="Source[11].type" Type="Str">Library</Property>
<Property Name="Source[12].destinationIndex" Type="Int">0</Property>
Expand Down Expand Up @@ -473,7 +465,7 @@
<Property Name="Source[8].sourceInclusion" Type="Str">Include</Property>
<Property Name="Source[8].type" Type="Str">Container</Property>
<Property Name="Source[9].destinationIndex" Type="Int">0</Property>
<Property Name="Source[9].itemID" Type="Ref">/My Computer/Config Classes/asynchronous execution module configuration.lvclass</Property>
<Property Name="Source[9].itemID" Type="Ref"></Property>
<Property Name="Source[9].sourceInclusion" Type="Str">Include</Property>
<Property Name="Source[9].type" Type="Str">Library</Property>
<Property Name="SourceCount" Type="Int">17</Property>
Expand Down
11 changes: 2 additions & 9 deletions source/pldevnosample.lvproj
Original file line number Diff line number Diff line change
Expand Up @@ -20,14 +20,6 @@
<Property Name="server.vi.callsEnabled" Type="Bool">true</Property>
<Property Name="server.vi.propertiesEnabled" Type="Bool">true</Property>
<Property Name="specify.custom.address" Type="Bool">false</Property>
<Item Name="asynchronous execution module" Type="Folder">
<Item Name="configuration" Type="Folder">
<Item Name="asynchronous execution module configuration.lvclass" Type="LVClass" URL="../asynchronous execution module/configuration/asynchronous execution module configuration.lvclass"/>
</Item>
<Item Name="runtime" Type="Folder">
<Item Name="asynchronous execution module runtime.lvclass" Type="LVClass" URL="../asynchronous execution module/runtime/asynchronous execution module runtime.lvclass"/>
</Item>
</Item>
<Item Name="Configuration Editor" Type="Folder">
<Item Name="PL Framework Configuration Tool.lvlib" Type="Library" URL="../Configuration Editor/PL Framework Configuration Tool.lvlib"/>
</Item>
Expand All @@ -54,7 +46,6 @@
</Item>
</Item>
<Item Name="tests" Type="Folder">
<Item Name="async tests.lvlib" Type="Library" URL="../asynchronous execution module/tests/async tests.lvlib"/>
<Item Name="configuration tests.lvlib" Type="Library" URL="../tests/configuration tests.lvlib"/>
</Item>
<Item Name="Dependencies" Type="Dependencies">
Expand Down Expand Up @@ -151,6 +142,8 @@
<Item Name="Validate Semaphore Size.vi" Type="VI" URL="/&lt;vilib&gt;/Utility/semaphor.llb/Validate Semaphore Size.vi"/>
<Item Name="whitespace.ctl" Type="VI" URL="/&lt;vilib&gt;/Utility/error.llb/whitespace.ctl"/>
</Item>
<Item Name="asynchronous execution module configuration.lvclass" Type="LVClass" URL="../asynchronous execution module/configuration/asynchronous execution module configuration.lvclass"/>
<Item Name="Asynchronous Module Editor Node.lvclass" Type="LVClass" URL="../asynchronous execution module/editor/Asynchronous Module Editor Node.lvclass"/>
<Item Name="module information.ctl" Type="VI" URL="../Configuration Editor/Classes/Engine Mappings/module information.ctl"/>
</Item>
<Item Name="Build Specifications" Type="Build"/>
Expand Down
Binary file modified source/tests/loader.vi
Binary file not shown.
Binary file modified source/tests/manual test deploy tool.vi
Binary file not shown.
Binary file modified source/tests/test module/editor node/GetText.vi
Binary file not shown.
Binary file modified source/tests/test module/editor node/configuration UI.vi
Binary file not shown.
Binary file modified source/tests/test module/editor node/initialize debug mode.vi
Binary file not shown.

0 comments on commit a877e62

Please sign in to comment.