Skip to content

Commit bd4552b

Browse files
nevstopKivenJia
andauthored
10-labview-host-api-for-tcp-router-client (#11)
* update deps * 调整代码逻辑布局 * add TcpRouter-Client.lvclass * add ASync-Resp TCP.vi * update example * 整理依赖关系 * 备份代码 * Update CSM-TCP-Router.vipb * Update Build_VIPM_Library.yml * #12 add "Wait for Server.vi" and "Ping.vi" for ClientAPI --------- Co-authored-by: NEVSTOP <nevstop> Co-authored-by: KivenJia <316979271@qq.com>
1 parent 207ca7b commit bd4552b

File tree

61 files changed

+770
-234
lines changed

Some content is hidden

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

61 files changed

+770
-234
lines changed

.github/workflows/Build_VIPM_Library.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,10 +29,10 @@ jobs:
2929

3030
# Get env variables
3131
# https://github.com/marketplace/actions/github-environment-variables-action
32-
- uses: FranzDiebold/github-env-vars-action@v2
32+
- uses: FranzDiebold/github-env-vars-action@v2.8.0
3333

3434
# Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
35-
- uses: actions/checkout@v3
35+
- uses: actions/checkout@v4
3636

3737
- name: vipm-InstallPackage
3838
uses: NEVSTOP-LAB/vipm-InstallPackage@main

CSM-TCP-Router.vipb

Lines changed: 19 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
<VI_Package_Builder_Settings Version="2020.1" Created_Date="2023-09-27 14:21:53" Modified_Date="2025-03-26 22:57:17" Creator="liyao" Comments="" ID="d445ff5669eab75606fa3bc7f2771d1e">
1+
<VI_Package_Builder_Settings Version="2020.1" Created_Date="2023-09-27 14:21:53" Modified_Date="2025-04-02 14:59:16" Creator="liyao" Comments="" ID="ff0b80497bf2e6b4e16e3b3c5f689a53">
22
<Library_General_Settings>
33
<Package_File_Name>NEVSTOP_lib_CSM_TCP_Router_Example</Package_File_Name>
4-
<Library_Version>2025.3.0.2</Library_Version>
4+
<Library_Version>2025.4.2.3</Library_Version>
55
<Auto_Increment_Version>false</Auto_Increment_Version>
66
<Library_Source_Folder>src</Library_Source_Folder>
77
<Library_Output_Folder>vip</Library_Output_Folder>
@@ -18,9 +18,9 @@
1818
<Advanced_Settings>
1919
<Package_Dependencies>
2020
<Additional_External_Dependencies>jki_lib_tcp_server &gt;=5.0.0.8</Additional_External_Dependencies>
21-
<Additional_External_Dependencies>nevstop_lib_communicable_state_machine &gt;=2025.3.24.114002</Additional_External_Dependencies>
22-
<Additional_External_Dependencies>nevstop_lib_csm_api_string_arguments_support &gt;=2025.3.14.155345</Additional_External_Dependencies>
23-
<Additional_External_Dependencies>nevstop_lib_csm_ini_static_variable_support &gt;=2025.3.23.221959</Additional_External_Dependencies>
21+
<Additional_External_Dependencies>nevstop_lib_communicable_state_machine &gt;=2025.3.29.104227</Additional_External_Dependencies>
22+
<Additional_External_Dependencies>nevstop_lib_csm_api_string_arguments_support &gt;=2025.3.30.1</Additional_External_Dependencies>
23+
<Additional_External_Dependencies>nevstop_lib_csm_ini_static_variable_support &gt;=2025.3.29.110710</Additional_External_Dependencies>
2424
<Additional_External_Dependencies>nevstop_lib_csm_massdata_parameter_support &gt;=2024.12.31.84154</Additional_External_Dependencies>
2525
<Additional_External_Dependencies>oglib_error &gt;=4.2.0.23</Additional_External_Dependencies>
2626
<Additional_External_Dependencies>oglib_time &gt;=4.0.1.3</Additional_External_Dependencies>
@@ -74,14 +74,13 @@
7474
<Copyright/>
7575
<Packager>NEVSTOP</Packager>
7676
<URL>https://github.com/NEVSTOP-LAB/CSM-TCP-Router-App</URL>
77-
<Release_Notes>[add] #4 support async message/register/unregister.
78-
[update] #8 Remove GlobalStop Library, multiple clients instances could work simultaneously</Release_Notes>
77+
<Release_Notes/>
7978
</Description>
8079
<Destinations>
8180
<Toolkit_VIs>
8281
<LLB>false</LLB>
8382
<Preserve_Hierarchy>true</Preserve_Hierarchy>
84-
<Path>&lt;user.lib&gt;\_NEVSTOP\CSM-TCP-Router</Path>
83+
<Path>&lt;user.lib&gt;\_NEVSTOP\Communicable State Machine(CSM)\addons</Path>
8584
</Toolkit_VIs>
8685
<Examples>
8786
<LLB>false</LLB>
@@ -144,6 +143,18 @@
144143
<Additional_Destination>false</Additional_Destination>
145144
<Additional_Destination_Index>0</Additional_Destination_Index>
146145
</Destination_Overrides>
146+
<Destination_Overrides>
147+
<Path>_addons</Path>
148+
<Destination>0</Destination>
149+
<Additional_Destination>false</Additional_Destination>
150+
<Additional_Destination_Index>0</Additional_Destination_Index>
151+
</Destination_Overrides>
152+
<Destination_Overrides>
153+
<Path>_addons/TCP-Router</Path>
154+
<Destination>0</Destination>
155+
<Additional_Destination>false</Additional_Destination>
156+
<Additional_Destination_Index>0</Additional_Destination_Index>
157+
</Destination_Overrides>
147158
<Password_Overrides>
148159
<Path>.</Path>
149160
<Password/>

src/CSM-TCP-Router(RT).lvproj

Lines changed: 461 additions & 0 deletions
Large diffs are not rendered by default.

src/CSM-TCP-Router.lvcsm

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
VIName = "HAL-AI.vi"
33

44
[CSMVI.HAL-AI.vi]
5-
Path = "<AppDir>/CSM_Modules/HAL-AI.vi"
5+
Path = "<AppDir>/Server/CSM_Modules/HAL-AI.vi"
66

77
[CSMAPI.HAL-AI.vi]
88
Item 0 = "Channels"
@@ -41,7 +41,7 @@ Item 25 = "DoSth: DoB"
4141
VIName = "HAL-DIO.vi"
4242

4343
[CSMVI.HAL-DIO.vi]
44-
Path = "<AppDir>/CSM_Modules/HAL-DIO.vi"
44+
Path = "<AppDir>/Server/CSM_Modules/HAL-DIO.vi"
4545

4646
[CSMAPI.HAL-DIO.vi]
4747
Item 0 = "Turn On"
@@ -87,7 +87,7 @@ VIName = "HAL-DIO.vi"
8787
VIName = "MAL-TEST.vi"
8888

8989
[CSMVI.MAL-TEST.vi]
90-
Path = "<AppDir>/CSM_Modules/MAL-TEST.vi"
90+
Path = "<AppDir>/Server/CSM_Modules/MAL-TEST.vi"
9191

9292
[CSMAPI.MAL-TEST.vi]
9393
Item 0 = "Sweep"
@@ -132,7 +132,7 @@ History Length = 50
132132
VIName = "CSM-TCP-Router.lvlib:CSM-TCP-Router.vi"
133133

134134
[CSMVI.CSM-TCP-Router.lvlib:CSM-TCP-Router.vi]
135-
Path = "<AppDir>/Server/_support/Module/CSM-TCP-Router.vi"
135+
Path = "<AppDir>/_addons/TCP-Router/CSM-TCP-Router.vi"
136136

137137
[CSMStates.CSM-TCP-Router.lvlib:CSM-TCP-Router.vi]
138138
Item 0 = "Idle"
@@ -166,7 +166,7 @@ Item 25 = "API: Stop JKI TCP Server"
166166
VIName = "CSM-TCP-Router.lvlib:Connection Handler Worker.vi"
167167

168168
[CSMVI.CSM-TCP-Router.lvlib:Connection Handler Worker.vi]
169-
Path = "<AppDir>/Server/_support/Module/_support/Connection Handler Worker.vi"
169+
Path = "<AppDir>/_addons/TCP-Router/_support/Connection Handler Worker.vi"
170170

171171
[CSMStates.CSM-TCP-Router.lvlib:Connection Handler Worker.vi]
172172
Item 0 = "Idle"

0 commit comments

Comments
 (0)