Skip to content

Commit b6f3137

Browse files
committed
[update] #8 Remove GlobalStop Library, multiple clients instances could work simultaneously
1 parent 539b34a commit b6f3137

File tree

6 files changed

+29
-28
lines changed

6 files changed

+29
-28
lines changed

CSM-TCP-Router.vipb

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<VI_Package_Builder_Settings Version="2020.1" Created_Date="2023-09-27 14:21:53" Modified_Date="2025-03-08 20:40:28" Creator="liyao" Comments="" ID="04d8c63c7b49c1de0c1e831b119398a8">
1+
<VI_Package_Builder_Settings Version="2020.1" Created_Date="2023-09-27 14:21:53" Modified_Date="2025-03-08 20:48:06" Creator="liyao" Comments="" ID="e3d9769db17fa88f1a2d02ea72f0ae6c">
22
<Library_General_Settings>
33
<Package_File_Name>NEVSTOP_lib_CSM_TCP_Router_Example</Package_File_Name>
44
<Library_Version>2025.3.0.2</Library_Version>
@@ -75,7 +75,7 @@
7575
<Copyright/>
7676
<Packager>NEVSTOP</Packager>
7777
<URL>https://github.com/NEVSTOP-LAB/CSM-TCP-Router-App</URL>
78-
<Release_Notes/>
78+
<Release_Notes>[update] #8 Remove GlobalStop Library, multiple clients instances could work simultaneously</Release_Notes>
7979
</Description>
8080
<Destinations>
8181
<Toolkit_VIs>

src/CSM-TCP-Router.lvcsm

Lines changed: 25 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,14 @@
11
[CSMModule.AI]
22
VIName = "HAL-AI.vi"
3+
4+
[CSMVI.HAL-AI.vi]
35
Path = "<AppDir>/CSM_Modules/HAL-AI.vi"
46

7+
[CSMAPI.HAL-AI.vi]
8+
Item 0 = "Channels"
9+
Item 1 = "read"
10+
Item 2 = "read all"
11+
512
[CSMStates.HAL-AI.vi]
613
Item 0 = "Idle"
714
Item 1 = "CSM Documentation"
@@ -30,18 +37,19 @@ Item 23 = "read all"
3037
Item 24 = "DoSth: DoA"
3138
Item 25 = "DoSth: DoB"
3239

33-
[CSMAPI.HAL-AI.vi]
34-
Item 0 = "Channels"
35-
Item 1 = "read"
36-
Item 2 = "read all"
37-
38-
[CSMDoc.HAL-AI.vi]
39-
doc = "AI Module with 4 Channels.%0AAPI:%0A1. Channels %2F%2F List all Channels %0A2. Read %3E%3E ChannelName%3BNum %2F%2FRead num of points from Channel specified.%0A3.read all %3E%3E Num %2F%2F Read num of points from all channels."
40-
4140
[CSMModule.DIO]
4241
VIName = "HAL-DIO.vi"
42+
43+
[CSMVI.HAL-DIO.vi]
4344
Path = "<AppDir>/CSM_Modules/HAL-DIO.vi"
4445

46+
[CSMAPI.HAL-DIO.vi]
47+
Item 0 = "Turn On"
48+
Item 1 = "Turn Off"
49+
Item 2 = "Check"
50+
Item 3 = "Check All"
51+
Item 4 = "Reset All"
52+
4553
[CSMStates.HAL-DIO.vi]
4654
Item 0 = "Idle"
4755
Item 1 = "CSM Documentation"
@@ -72,24 +80,19 @@ Item 25 = "Reset All"
7280
Item 26 = "DoSth: DoA"
7381
Item 27 = "DoSth: DoB"
7482

75-
[CSMAPI.HAL-DIO.vi]
76-
Item 0 = "Turn On"
77-
Item 1 = "Turn Off"
78-
Item 2 = "Check"
79-
Item 3 = "Check All"
80-
Item 4 = "Reset All"
81-
82-
[CSMDoc.HAL-DIO.vi]
83-
doc = "DIO Module with 8 Channels.%0AAPI:%0A1. TurnOn %3E%3E ChannelIndex %2F%2FSet Channel to ON.%0A2. TurnOff %3E%3E ChannelIndex %2F%2FSet Channel to OFF.%0A3. Check %3E%3E ChannelIndex %2F%2FCheck current status of Channel.%0A4. CheckAll %2F%2FCheck status of all channels%0A5. ResetAll %2F%2FReset All channels"
84-
8583
[CSMModule.DIO2]
8684
VIName = "HAL-DIO.vi"
87-
Path = "<AppDir>/CSM_Modules/HAL-DIO.vi"
8885

8986
[CSMModule.Measure]
9087
VIName = "MAL-TEST.vi"
88+
89+
[CSMVI.MAL-TEST.vi]
9190
Path = "<AppDir>/CSM_Modules/MAL-TEST.vi"
9291

92+
[CSMAPI.MAL-TEST.vi]
93+
Item 0 = "Sweep"
94+
Item 1 = "Measure"
95+
9396
[CSMStates.MAL-TEST.vi]
9497
Item 0 = "Idle"
9598
Item 1 = "CSM Documentation"
@@ -117,9 +120,6 @@ Item 22 = "Measure"
117120
Item 23 = "DoSth: DoA"
118121
Item 24 = "DoSth: DoB"
119122

120-
[CSMAPI.MAL-TEST.vi]
121-
Item 0 = "Sweep"
122-
Item 1 = "Measure"
123-
124-
[CSMDoc.MAL-TEST.vi]
125-
doc = "Measurement Module.%0AAPI: %0A1. Sweep %3E%3E Start%3BStop%3BStep%3BInterval %2F%2F sweep current with specified parameters.%0A2. Measure %2F%2F Return voltage and current at the same time."
123+
[CSM Debug Console]
124+
Response Timeout(s) = 30
125+
History Length = 50

src/CSM-TCP-Router.lvproj

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,10 +39,10 @@
3939
<Item Name="csmHelper-SubVI.lvlib" Type="Library" URL="/&lt;userlib&gt;/_NEVSTOP/Communicable State Machine(CSM)/_csmHelper/Utility/_Support/SubVI.llb/csmHelper-SubVI.lvlib"/>
4040
<Item Name="csmHelper-Terminals.lvlib" Type="Library" URL="/&lt;userlib&gt;/_NEVSTOP/Communicable State Machine(CSM)/_csmHelper/Utility/_Support/Terminals.llb/csmHelper-Terminals.lvlib"/>
4141
<Item Name="csmHelper-Wire.lvlib" Type="Library" URL="/&lt;userlib&gt;/_NEVSTOP/Communicable State Machine(CSM)/_csmHelper/Utility/_Support/Wire.llb/csmHelper-Wire.lvlib"/>
42-
<Item Name="GSTOP.lvlib" Type="Library" URL="/&lt;userlib&gt;/_NEVSTOP/GlobalStop/GSTOP.lvlib"/>
4342
<Item Name="INI-Static-Variable-Support.lvlib" Type="Library" URL="/&lt;userlib&gt;/_NEVSTOP/Communicable State Machine(CSM)/addons/INI-Static-Variable-Support/INI-Static-Variable-Support.lvlib"/>
4443
<Item Name="LabVIEW-Config.lvlib" Type="Library" URL="/&lt;userlib&gt;/_NEVSTOP/Communicable State Machine(CSM)/addons/INI-Static-Variable-Support/LabVIEW-Config/LabVIEW-Config.lvlib"/>
4544
<Item Name="lvcsm File Support.lvlib" Type="Library" URL="/&lt;userlib&gt;/_NEVSTOP/Communicable State Machine(CSM)/_csmHelper/lvcsmFile/lvcsm File Support.lvlib"/>
45+
<Item Name="Remove Duplicates from 1D Array (String)__ogtk.vi" Type="VI" URL="/&lt;userlib&gt;/_OpenG.lib/array/array.llb/Remove Duplicates from 1D Array (String)__ogtk.vi"/>
4646
<Item Name="Tick Count (ms)__ogtk.vi" Type="VI" URL="/&lt;userlib&gt;/_OpenG.lib/time/time.llb/Tick Count (ms)__ogtk.vi"/>
4747
</Item>
4848
<Item Name="vi.lib" Type="Folder">
@@ -339,6 +339,7 @@ AddOutputFilter chunkFilter
339339
<Item Name="INI-Static-Variable-Support.lvlib" Type="Library" URL="/&lt;userlib&gt;/_NEVSTOP/Communicable State Machine(CSM)/addons/INI-Static-Variable-Support/INI-Static-Variable-Support.lvlib"/>
340340
<Item Name="LabVIEW-Config.lvlib" Type="Library" URL="/&lt;userlib&gt;/_NEVSTOP/Communicable State Machine(CSM)/addons/INI-Static-Variable-Support/LabVIEW-Config/LabVIEW-Config.lvlib"/>
341341
<Item Name="lvcsm File Support.lvlib" Type="Library" URL="/&lt;userlib&gt;/_NEVSTOP/Communicable State Machine(CSM)/_csmHelper/lvcsmFile/lvcsm File Support.lvlib"/>
342+
<Item Name="Remove Duplicates from 1D Array (String)__ogtk.vi" Type="VI" URL="/&lt;userlib&gt;/_OpenG.lib/array/array.llb/Remove Duplicates from 1D Array (String)__ogtk.vi"/>
342343
<Item Name="Tick Count (ms)__ogtk.vi" Type="VI" URL="/&lt;userlib&gt;/_OpenG.lib/time/time.llb/Tick Count (ms)__ogtk.vi"/>
343344
</Item>
344345
<Item Name="vi.lib" Type="Folder">

src/Client/Client.vi

-1.4 KB
Binary file not shown.

src/Client/Mulit-Clients Example.vi

3.71 KB
Binary file not shown.
0 Bytes
Binary file not shown.

0 commit comments

Comments
 (0)