Skip to content

Dev202505 #14

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.

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
merged 5 commits into from
May 29, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
13 changes: 7 additions & 6 deletions CSM-TCP-Router.vipb
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-04-02 14:59:16" Creator="liyao" Comments="" ID="ff0b80497bf2e6b4e16e3b3c5f689a53">
<VI_Package_Builder_Settings Version="2020.1" Created_Date="2023-09-27 14:21:53" Modified_Date="2025-05-28 13:01:25" Creator="liyao" Comments="" ID="4eb72ca585b47386ba05af730dda1640">
<Library_General_Settings>
<Package_File_Name>NEVSTOP_lib_CSM_TCP_Router_Example</Package_File_Name>
<Library_Version>2025.4.2.3</Library_Version>
<Library_Version>2025.5.0.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.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_communicable_state_machine &gt;=2025.5.28.833</Additional_External_Dependencies>
<Additional_External_Dependencies>nevstop_lib_csm_api_string_arguments_support &gt;=2025.5.27.231431</Additional_External_Dependencies>
<Additional_External_Dependencies>nevstop_lib_csm_ini_static_variable_support &gt;=2025.5.19.114210</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,7 +74,8 @@
<Copyright/>
<Packager>NEVSTOP</Packager>
<URL>https://github.com/NEVSTOP-LAB/CSM-TCP-Router-App</URL>
<Release_Notes/>
<Release_Notes>[add] #3 support massdata in TCPRouter
[fix] #13 use TCP timeout configuration in REP-REQ TCP.vi by default</Release_Notes>
</Description>
<Destinations>
<Toolkit_VIs>
Expand Down
11 changes: 6 additions & 5 deletions src/CSM-TCP-Router.lvcsm
Original file line number Diff line number Diff line change
Expand Up @@ -33,9 +33,10 @@ Item 19 = "Macro: Initialize"
Item 20 = "Macro: Exit"
Item 21 = "Channels"
Item 22 = "read"
Item 23 = "read all"
Item 24 = "DoSth: DoA"
Item 25 = "DoSth: DoB"
Item 23 = "read(massdata)"
Item 24 = "read all"
Item 25 = "DoSth: DoA"
Item 26 = "DoSth: DoB"

[CSMModule.DIO]
VIName = "HAL-DIO.vi"
Expand Down Expand Up @@ -125,8 +126,8 @@ Item 27 = "action: loop check"
Item 28 = "action: end loop"

[CSM Debug Console]
Response Timeout(s) = 30
History Length = 50
Response Timeout(s) = 30
History Length = 50

[CSMModule.CSM TCP Router]
VIName = "CSM-TCP-Router.lvlib:CSM-TCP-Router.vi"
Expand Down
5 changes: 2 additions & 3 deletions src/CSM-TCP-Router.lvproj
Original file line number Diff line number Diff line change
Expand Up @@ -35,10 +35,11 @@
<Item Name="CSM - user.lib Dir.vi" Type="VI" URL="/&lt;userlib&gt;/_NEVSTOP/Communicable State Machine(CSM)/_Documentation/CSM - user.lib Dir.vi"/>
<Item Name="CSM File Logger.lvlib" Type="Library" URL="/&lt;userlib&gt;/_NEVSTOP/Communicable State Machine(CSM)/addons/Logger/CSM File Logger.lvlib"/>
<Item Name="CSM Loop Support.lvlib" Type="Library" URL="/&lt;userlib&gt;/_NEVSTOP/Communicable State Machine(CSM)/addons/Loop-Support/CSM Loop Support.lvlib"/>
<Item Name="CSM MassData Parameter Support.lvlib" Type="Library" URL="/&lt;userlib&gt;/_NEVSTOP/Communicable State Machine(CSM)/addons/MassData-Parameter/CSM MassData Parameter Support.lvlib"/>
<Item Name="CSM Shared.lvlib" Type="Library" URL="/&lt;userlib&gt;/_NEVSTOP/Communicable State Machine(CSM)/_Shared/CSM Shared.lvlib"/>
<Item Name="CSM-Helper API with lvcsm Support.lvlib" Type="Library" URL="/&lt;userlib&gt;/_NEVSTOP/Communicable State Machine(CSM)/_csmHelper/API with lvcsm Support/CSM-Helper API with lvcsm Support.lvlib"/>
<Item Name="CSM-Helper Utility.lvlib" Type="Library" URL="/&lt;userlib&gt;/_NEVSTOP/Communicable State Machine(CSM)/_csmHelper/Utility/CSM-Helper Utility.lvlib"/>
<Item Name="CSM-Helper.lvclass" Type="LVClass" URL="/&lt;userlib&gt;/_NEVSTOP/Communicable State Machine(CSM)/_csmHelper/CSM-Helper.lvclass"/>
<Item Name="csm-tool-support.lvlib" Type="Library" URL="/&lt;userlib&gt;/_NEVSTOP/Communicable State Machine(CSM)/_tool/_Support/csm-tool-support.lvlib"/>
<Item Name="csmHelper-CaseStructure.lvlib" Type="Library" URL="/&lt;userlib&gt;/_NEVSTOP/Communicable State Machine(CSM)/_csmHelper/Utility/_Support/CaseStructure.llb/csmHelper-CaseStructure.lvlib"/>
<Item Name="csmHelper-Diagram.lvlib" Type="Library" URL="/&lt;userlib&gt;/_NEVSTOP/Communicable State Machine(CSM)/_csmHelper/Utility/_Support/Diagram.llb/csmHelper-Diagram.lvlib"/>
<Item Name="csmHelper-GObject.lvlib" Type="Library" URL="/&lt;userlib&gt;/_NEVSTOP/Communicable State Machine(CSM)/_csmHelper/Utility/_Support/GObject.llb/csmHelper-GObject.lvlib"/>
Expand Down Expand Up @@ -106,7 +107,6 @@
<Item Name="ISO8601 Date Formats.ctl" Type="VI" URL="/&lt;vilib&gt;/LabVIEW Open Source Project/Epoch Date &amp; Time/formatter.iso8601/ISO8601 Date Formats.ctl"/>
<Item Name="ISO8601 DateString to Timestamp.vi" Type="VI" URL="/&lt;vilib&gt;/LabVIEW Open Source Project/Epoch Date &amp; Time/formatter.iso8601/ISO8601 DateString to Timestamp.vi"/>
<Item Name="JKI TCP Server.lvclass" Type="LVClass" URL="/&lt;vilib&gt;/addons/_JKI.lib/_JKI_lib_TCP_Server.llb/JKI TCP Server.lvclass"/>
<Item Name="List Directory and LLBs.vi" Type="VI" URL="/&lt;vilib&gt;/Utility/libraryn.llb/List Directory and LLBs.vi"/>
<Item Name="Longest Line Length in Pixels.vi" Type="VI" URL="/&lt;vilib&gt;/Utility/error.llb/Longest Line Length in Pixels.vi"/>
<Item Name="LVBoundsTypeDef.ctl" Type="VI" URL="/&lt;vilib&gt;/Utility/miscctls.llb/LVBoundsTypeDef.ctl"/>
<Item Name="LVDateTimeRec.ctl" Type="VI" URL="/&lt;vilib&gt;/Utility/miscctls.llb/LVDateTimeRec.ctl"/>
Expand All @@ -123,7 +123,6 @@
<Item Name="Obtain Semaphore Reference.vi" Type="VI" URL="/&lt;vilib&gt;/Utility/semaphor.llb/Obtain Semaphore Reference.vi"/>
<Item Name="Parse State Queue__JKI_lib_State_Machine.vi" Type="VI" URL="/&lt;vilib&gt;/addons/_JKI Toolkits/State Machine/_JKI_lib_State_Machine.llb/Parse State Queue__JKI_lib_State_Machine.vi"/>
<Item Name="RectSize.vi" Type="VI" URL="/&lt;vilib&gt;/picture/PictureSupport.llb/RectSize.vi"/>
<Item Name="Recursive File List.vi" Type="VI" URL="/&lt;vilib&gt;/Utility/libraryn.llb/Recursive File List.vi"/>
<Item Name="Release Semaphore Reference.vi" Type="VI" URL="/&lt;vilib&gt;/Utility/semaphor.llb/Release Semaphore Reference.vi"/>
<Item Name="Release Semaphore.vi" Type="VI" URL="/&lt;vilib&gt;/Utility/semaphor.llb/Release Semaphore.vi"/>
<Item Name="Release Semaphore_71.vi" Type="VI" URL="/&lt;vilib&gt;/Utility/semaphor.llb/Release Semaphore_71.vi"/>
Expand Down
Binary file modified src/Client Console/Client Console.vi
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file modified src/ClientAPI Example/TCPRouter ClientAPI Example 2.vi
Binary file not shown.
Binary file modified src/ClientAPI Example/TCPRouter ClientAPI Example 3.vi
Binary file not shown.
Binary file modified src/ClientAPI Example/TCPRouter ClientAPI Example 4.vi
Binary file not shown.
Binary file modified src/Server/CSM-TCP-Router(Server).vi
Binary file not shown.
Binary file modified src/Server/CSM_Modules/HAL-AI.vi
Binary file not shown.
Binary file modified src/Server/CSM_Modules/HAL-DIO.vi
Binary file not shown.
Binary file modified src/Server/CSM_Modules/MAL-TEST.vi
Binary file not shown.
3 changes: 2 additions & 1 deletion src/_addons/TCP-Router/CSM-TCP-Router.lvlib
Original file line number Diff line number Diff line change
Expand Up @@ -9,14 +9,15 @@
<Item Name="TcpRouter-Client.lvclass" Type="LVClass" URL="../ClientAPI/TcpRouter-Client.lvclass"/>
</Item>
<Item Name="Support" Type="Folder">
<Property Name="NI.SortType" Type="Int">3</Property>
<Item Name="Connection Handler Worker.vi" Type="VI" URL="../_support/Connection Handler Worker.vi"/>
<Item Name="Error If Module Not Exist.vi" Type="VI" URL="../_support/Error If Module Not Exist.vi"/>
<Item Name="pack tcp packet.vi" Type="VI" URL="../_support/pack tcp packet.vi"/>
<Item Name="Read CSM Doc.vi" Type="VI" URL="../_support/Read CSM Doc.vi"/>
<Item Name="TCP Safe Read.vi" Type="VI" URL="../_support/TCP Safe Read.vi"/>
<Item Name="TCP Send Command Respone.vi" Type="VI" URL="../_support/TCP Send Command Respone.vi"/>
<Item Name="TCP Send Info.vi" Type="VI" URL="../_support/TCP Send Info.vi"/>
<Item Name="TCP Send Response.vi" Type="VI" URL="../_support/TCP Send Response.vi"/>
<Item Name="pack tcp packet.vi" Type="VI" URL="../_support/pack tcp packet.vi"/>
<Item Name="unpack tcp packet.vi" Type="VI" URL="../_support/unpack tcp packet.vi"/>
</Item>
<Item Name="Typedef" Type="Folder">
Expand Down
Binary file modified src/_addons/TCP-Router/CSM-TCP-Router.vi
Binary file not shown.
Binary file modified src/_addons/TCP-Router/ClientAPI/ASync-Response Queue.vi
Binary file not shown.
Binary file modified src/_addons/TCP-Router/ClientAPI/ASync-Response User Event.vi
Binary file not shown.
Binary file modified src/_addons/TCP-Router/ClientAPI/Ping.vi
Binary file not shown.
Binary file modified src/_addons/TCP-Router/ClientAPI/Post Message.vi
Binary file not shown.
Binary file modified src/_addons/TCP-Router/ClientAPI/Post No-Rep Message.vi
Binary file not shown.
Binary file modified src/_addons/TCP-Router/ClientAPI/Register Status Change.vi
Binary file not shown.
Binary file modified src/_addons/TCP-Router/ClientAPI/Register Status for Client.vi
Binary file not shown.
Binary file modified src/_addons/TCP-Router/ClientAPI/Send Message and Wait for Reply.vi
Binary file not shown.
Binary file modified src/_addons/TCP-Router/ClientAPI/Status Queue.vi
Binary file not shown.
Binary file modified src/_addons/TCP-Router/ClientAPI/Unregister Status Change.vi
Binary file not shown.
Binary file modified src/_addons/TCP-Router/ClientAPI/Unregister Status for Client.vi
Binary file not shown.
Binary file modified src/_addons/TCP-Router/ClientAPI/Wait for Server.vi
Binary file not shown.
Binary file modified src/_addons/TCP-Router/ClientAPI/_support/ASync-Resp TCP.vi
Binary file not shown.
Binary file not shown.
Binary file modified src/_addons/TCP-Router/ClientAPI/_support/REP-REQ TCP.vi
Binary file not shown.
Binary file modified src/_addons/TCP-Router/ClientAPI/_support/Status TCP.vi
Binary file not shown.
Binary file not shown.
Binary file modified src/_addons/TCP-Router/_support/Connection Handler Worker.vi
Binary file not shown.
Binary file modified src/_addons/TCP-Router/_support/Error If Module Not Exist.vi
Binary file not shown.
Binary file modified src/_addons/TCP-Router/_support/Read CSM Doc.vi
Binary file not shown.
Binary file modified src/_addons/TCP-Router/_support/TCP Safe Read.vi
Binary file not shown.
Binary file modified src/_addons/TCP-Router/_support/TCP Send Command Respone.vi
Binary file not shown.
Binary file modified src/_addons/TCP-Router/_support/TCP Send Info.vi
Binary file not shown.
Binary file modified src/_addons/TCP-Router/_support/TCP Send Response.vi
Binary file not shown.
Binary file modified src/_addons/TCP-Router/_support/pack tcp packet.vi
Binary file not shown.
Binary file modified src/_addons/TCP-Router/_support/unpack tcp packet.vi
Binary file not shown.
Loading