Skip to content

Commit 4b4e8a6

Browse files
Merge branch 'release/1.3.0'
2 parents a841f93 + 8d5e8d7 commit 4b4e8a6

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

44 files changed

+211
-31
lines changed

src/JKI State Machine Objects.vipb

Lines changed: 21 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
<VI_Package_Builder_Settings Version="0.6" Created_Date="2015-12-04 15:52:35" Modified_Date="2017-04-13 10:38:21" Creator="Francois Normandin" Comments="" ID="eb7b68b86766f7db636e5c87c5263aa2">
1+
<VI_Package_Builder_Settings Version="2017" Created_Date="2015-12-04 15:52:35" Modified_Date="2017-11-11 18:30:28" Creator="Francois Normandin" Comments="" ID="de147157920ef22c0f140a84db50eb09">
22
<Library_General_Settings>
33
<Package_File_Name>JKI_StateMachineObjects</Package_File_Name>
4-
<Library_Version>1.2.1.56</Library_Version>
4+
<Library_Version>1.3.0.57</Library_Version>
55
<Auto_Increment_Version>false</Auto_Increment_Version>
66
<Library_Source_Folder>.</Library_Source_Folder>
77
<Library_Output_Folder>..\..\..</Library_Output_Folder>
@@ -41,8 +41,13 @@ The JKI SMO NI Community Group (https://decibel.ni.com/content/groups/jki-state-
4141
<Copyright/>
4242
<Packager>JKI</Packager>
4343
<URL>https://github.com/JKISoftware/JKI-State-Machine-Objects</URL>
44-
<Release_Notes>[Fix: 38]enumerateStaticDependencies is now called only during startup process.
45-
</Release_Notes>
44+
<Release_Notes>[Fix: 40] onProcessStart( ) has been moved to the process thread to be symmetrical with onProcessStop( ).
45+
[Fix: 41] onStopped, onStarted and onProcessStopped methods must require overrides to call parent.
46+
[Fix: 42] Process now resets call-parent state when process terminates, to prepare process for consistent restart conditions, if requested.
47+
[Fix: 43] onProcessStopped now symmetrical with onProcessStart, in Process thread.
48+
[Feature: 45] Create method now allows a dependency to be declared as shared without specific ownership.
49+
[Fix: 46] dependencies are now stopped during the onStopped callback, not onStop.
50+
[Fix: 47] LaunchDependency method, called during onStart, is split in two parts: one that creates the dependency and takes ownership on creation (in a non-reentrant method to disallow concurrent creations), the second to start the dependency which is reentrant to allow recursive calls.</Release_Notes>
4651
</Description>
4752
<Destinations>
4853
<Toolkit_VIs>
@@ -98,6 +103,11 @@ The JKI SMO NI Community Group (https://decibel.ni.com/content/groups/jki-state-
98103
<Preserve_Hierarchy>true</Preserve_Hierarchy>
99104
<Path/>
100105
</Project_Provider>
106+
<QuickDrop_Plugins>
107+
<LLB>false</LLB>
108+
<Preserve_Hierarchy>true</Preserve_Hierarchy>
109+
<Path/>
110+
</QuickDrop_Plugins>
101111
</Destinations>
102112
<Source_Files>
103113
<Destination_Overrides>
@@ -257,7 +267,7 @@ The JKI SMO NI Community Group (https://decibel.ni.com/content/groups/jki-state-
257267
<Path>SMOFacade\Facade</Path>
258268
<VI_Title/>
259269
</Items_Data>
260-
<GUID>A5934D3DB396070ED56DDEA165669AEF</GUID>
270+
<GUID>90BCD81832E9100F786B7B245F5AC390</GUID>
261271
</Functions_Palette_Data>
262272
<Functions_Palette_Data>
263273
<Parent_Palette_Index>0</Parent_Palette_Index>
@@ -544,7 +554,7 @@ The JKI SMO NI Community Group (https://decibel.ni.com/content/groups/jki-state-
544554
<Path>SMO\CheckAccessibility.vi</Path>
545555
<VI_Title/>
546556
</Items_Data>
547-
<GUID>D932AE9645F8FF3A62B174B179812525</GUID>
557+
<GUID>33E07BF9A07429EF346A71238A65DC73</GUID>
548558
</Functions_Palette_Data>
549559
<Functions_Palette_Data>
550560
<Parent_Palette_Index>0</Parent_Palette_Index>
@@ -677,7 +687,7 @@ The JKI SMO NI Community Group (https://decibel.ni.com/content/groups/jki-state-
677687
<Path>Protected</Path>
678688
<VI_Title/>
679689
</Items_Data>
680-
<GUID>E35BE0D91E3E176547BD28F5B03A21DF</GUID>
690+
<GUID>88B9A03A161D86494F202363DB6DC5EE</GUID>
681691
</Functions_Palette_Data>
682692
<Functions_Palette_Data>
683693
<Parent_Palette_Index>1</Parent_Palette_Index>
@@ -908,7 +918,7 @@ The JKI SMO NI Community Group (https://decibel.ni.com/content/groups/jki-state-
908918
<Path>SMO\Protected\ListDependencies.vi</Path>
909919
<VI_Title/>
910920
</Items_Data>
911-
<GUID>7BC05511D6B6FF92F6759E186E04682C</GUID>
921+
<GUID>153BD716DC17498F8D2E30AC83B24F3C</GUID>
912922
</Functions_Palette_Data>
913923
<Functions_Palette_Data>
914924
<Parent_Palette_Index>2</Parent_Palette_Index>
@@ -943,7 +953,7 @@ The JKI SMO NI Community Group (https://decibel.ni.com/content/groups/jki-state-
943953
<Path>SMO.UI\Show User Interface.vi</Path>
944954
<VI_Title/>
945955
</Items_Data>
946-
<GUID>5C0A6181DA85E15CF99570F3C5066899</GUID>
956+
<GUID>3D9BE4B2506D2C708F915BF9967831B5</GUID>
947957
</Functions_Palette_Data>
948958
<Functions_Palette_Data>
949959
<Parent_Palette_Index>0</Parent_Palette_Index>
@@ -992,7 +1002,7 @@ The JKI SMO NI Community Group (https://decibel.ni.com/content/groups/jki-state-
9921002
<Path>URI Parsing\Parse URI.vi</Path>
9931003
<VI_Title/>
9941004
</Items_Data>
995-
<GUID>32DAF4AD39C72622051A204F7146F7BC</GUID>
1005+
<GUID>5304FDD78C86B18E1739378BB0CA2B0F</GUID>
9961006
</Functions_Palette_Data>
9971007
<Functions_Palette_Data>
9981008
<Parent_Palette_Index>0</Parent_Palette_Index>
@@ -1153,7 +1163,7 @@ The JKI SMO NI Community Group (https://decibel.ni.com/content/groups/jki-state-
11531163
<Path>SMOFacade\Facade\Get Method Prototype.vi</Path>
11541164
<VI_Title/>
11551165
</Items_Data>
1156-
<GUID>F5045023FC5B0E14AF8506164CBBA300</GUID>
1166+
<GUID>A3F0A2B1697EC2B2007B912C362C73B7</GUID>
11571167
</Functions_Palette_Data>
11581168
</Library_Palette_Definition>
11591169
</VI_Package_Builder_Settings>

src/SMO/Create.vi

1.24 KB
Binary file not shown.

src/SMO/Private/AddDependency.vi

124 Bytes
Binary file not shown.
16.4 KB
Binary file not shown.
14.8 KB
Binary file not shown.
20.3 KB
Binary file not shown.

src/SMO/Private/LaunchProcess.vi

876 Bytes
Binary file not shown.
23.7 KB
Binary file not shown.
-13.1 KB
Binary file not shown.

src/SMO/Private/StartProcesses.vi

-888 Bytes
Binary file not shown.

0 commit comments

Comments
 (0)