Skip to content

10-labview-host-api-for-tcp-router-client #11

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
nevstop merged 10 commits into from
Apr 7, 2025
Merged

10-labview-host-api-for-tcp-router-client #11

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
f33b942
update deps
Mar 31, 2025
003ac56
调整代码逻辑布局
Mar 31, 2025
81f108a
add TcpRouter-Client.lvclass
Apr 1, 2025
37d71db
add ASync-Resp TCP.vi
Apr 1, 2025
b0e0a30
update example
Apr 1, 2025
73a6333
整理依赖关系
Apr 2, 2025
b663f20
备份代码
Apr 2, 2025
e8ae0b1
Update CSM-TCP-Router.vipb
KivenJia Apr 2, 2025
8549d75
Update Build_VIPM_Library.yml
KivenJia Apr 2, 2025
3da721c
#12 add "Wait for Server.vi" and "Ping.vi" for ClientAPI
Apr 7, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/Build_VIPM_Library.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,10 +29,10 @@ jobs:

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

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

- name: vipm-InstallPackage
uses: NEVSTOP-LAB/vipm-InstallPackage@main
Expand Down
27 changes: 19 additions & 8 deletions CSM-TCP-Router.vipb
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<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">
<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">
<Library_General_Settings>
<Package_File_Name>NEVSTOP_lib_CSM_TCP_Router_Example</Package_File_Name>
<Library_Version>2025.3.0.2</Library_Version>
<Library_Version>2025.4.2.3</Library_Version>
<Auto_Increment_Version>false</Auto_Increment_Version>
<Library_Source_Folder>src</Library_Source_Folder>
<Library_Output_Folder>vip</Library_Output_Folder>
Expand All @@ -18,9 +18,9 @@
<Advanced_Settings>
<Package_Dependencies>
<Additional_External_Dependencies>jki_lib_tcp_server &gt;=5.0.0.8</Additional_External_Dependencies>
<Additional_External_Dependencies>nevstop_lib_communicable_state_machine &gt;=2025.3.24.114002</Additional_External_Dependencies>
<Additional_External_Dependencies>nevstop_lib_csm_api_string_arguments_support &gt;=2025.3.14.155345</Additional_External_Dependencies>
<Additional_External_Dependencies>nevstop_lib_csm_ini_static_variable_support &gt;=2025.3.23.221959</Additional_External_Dependencies>
<Additional_External_Dependencies>nevstop_lib_communicable_state_machine &gt;=2025.3.29.104227</Additional_External_Dependencies>
<Additional_External_Dependencies>nevstop_lib_csm_api_string_arguments_support &gt;=2025.3.30.1</Additional_External_Dependencies>
<Additional_External_Dependencies>nevstop_lib_csm_ini_static_variable_support &gt;=2025.3.29.110710</Additional_External_Dependencies>
<Additional_External_Dependencies>nevstop_lib_csm_massdata_parameter_support &gt;=2024.12.31.84154</Additional_External_Dependencies>
<Additional_External_Dependencies>oglib_error &gt;=4.2.0.23</Additional_External_Dependencies>
<Additional_External_Dependencies>oglib_time &gt;=4.0.1.3</Additional_External_Dependencies>
Expand Down Expand Up @@ -74,14 +74,13 @@
<Copyright/>
<Packager>NEVSTOP</Packager>
<URL>https://github.com/NEVSTOP-LAB/CSM-TCP-Router-App</URL>
<Release_Notes>[add] #4 support async message/register/unregister.
[update] #8 Remove GlobalStop Library, multiple clients instances could work simultaneously</Release_Notes>
<Release_Notes/>
</Description>
<Destinations>
<Toolkit_VIs>
<LLB>false</LLB>
<Preserve_Hierarchy>true</Preserve_Hierarchy>
<Path>&lt;user.lib&gt;\_NEVSTOP\CSM-TCP-Router</Path>
<Path>&lt;user.lib&gt;\_NEVSTOP\Communicable State Machine(CSM)\addons</Path>
</Toolkit_VIs>
<Examples>
<LLB>false</LLB>
Expand Down Expand Up @@ -144,6 +143,18 @@
<Additional_Destination>false</Additional_Destination>
<Additional_Destination_Index>0</Additional_Destination_Index>
</Destination_Overrides>
<Destination_Overrides>
<Path>_addons</Path>
<Destination>0</Destination>
<Additional_Destination>false</Additional_Destination>
<Additional_Destination_Index>0</Additional_Destination_Index>
</Destination_Overrides>
<Destination_Overrides>
<Path>_addons/TCP-Router</Path>
<Destination>0</Destination>
<Additional_Destination>false</Additional_Destination>
<Additional_Destination_Index>0</Additional_Destination_Index>
</Destination_Overrides>
<Password_Overrides>
<Path>.</Path>
<Password/>
Expand Down
461 changes: 461 additions & 0 deletions src/CSM-TCP-Router(RT).lvproj
View file
Open in desktop

Large diffs are not rendered by default.

10 changes: 5 additions & 5 deletions src/CSM-TCP-Router.lvcsm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
VIName = "HAL-AI.vi"

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

[CSMAPI.HAL-AI.vi]
Item 0 = "Channels"
Expand Down Expand Up @@ -41,7 +41,7 @@ Item 25 = "DoSth: DoB"
VIName = "HAL-DIO.vi"

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

[CSMAPI.HAL-DIO.vi]
Item 0 = "Turn On"
Expand Down Expand Up @@ -87,7 +87,7 @@ VIName = "HAL-DIO.vi"
VIName = "MAL-TEST.vi"

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

[CSMAPI.MAL-TEST.vi]
Item 0 = "Sweep"
Expand Down Expand Up @@ -132,7 +132,7 @@ History Length = 50
VIName = "CSM-TCP-Router.lvlib:CSM-TCP-Router.vi"

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

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

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

[CSMStates.CSM-TCP-Router.lvlib:Connection Handler Worker.vi]
Item 0 = "Idle"
Expand Down
Loading
Loading