diff --git a/CSM-TCP-Router.vipb b/CSM-TCP-Router.vipb index 6d9c0bc..e9a36cb 100644 --- a/CSM-TCP-Router.vipb +++ b/CSM-TCP-Router.vipb @@ -1,7 +1,7 @@ - + NEVSTOP_lib_CSM_TCP_Router_Example - 2025.4.2.3 + 2025.5.0.3 false src vip @@ -18,9 +18,9 @@ jki_lib_tcp_server >=5.0.0.8 - nevstop_lib_communicable_state_machine >=2025.3.29.104227 - nevstop_lib_csm_api_string_arguments_support >=2025.3.30.1 - nevstop_lib_csm_ini_static_variable_support >=2025.3.29.110710 + nevstop_lib_communicable_state_machine >=2025.5.28.833 + nevstop_lib_csm_api_string_arguments_support >=2025.5.27.231431 + nevstop_lib_csm_ini_static_variable_support >=2025.5.19.114210 nevstop_lib_csm_massdata_parameter_support >=2024.12.31.84154 oglib_error >=4.2.0.23 oglib_time >=4.0.1.3 @@ -74,7 +74,8 @@ NEVSTOP https://github.com/NEVSTOP-LAB/CSM-TCP-Router-App - + [add] #3 support massdata in TCPRouter +[fix] #13 use TCP timeout configuration in REP-REQ TCP.vi by default diff --git a/src/CSM-TCP-Router.lvcsm b/src/CSM-TCP-Router.lvcsm index 90cd09a..5e2bee7 100644 --- a/src/CSM-TCP-Router.lvcsm +++ b/src/CSM-TCP-Router.lvcsm @@ -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" @@ -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" diff --git a/src/CSM-TCP-Router.lvproj b/src/CSM-TCP-Router.lvproj index 8a36813..f9ed87e 100644 --- a/src/CSM-TCP-Router.lvproj +++ b/src/CSM-TCP-Router.lvproj @@ -35,10 +35,11 @@ + + - @@ -106,7 +107,6 @@ - @@ -123,7 +123,6 @@ - diff --git a/src/Client Console/Client Console.vi b/src/Client Console/Client Console.vi index 6e09608..5974b9f 100644 Binary files a/src/Client Console/Client Console.vi and b/src/Client Console/Client Console.vi differ diff --git a/src/ClientAPI Example/TCP Router MassData Support Prototype.vi b/src/ClientAPI Example/TCP Router MassData Support Prototype.vi new file mode 100644 index 0000000..4c737bd Binary files /dev/null and b/src/ClientAPI Example/TCP Router MassData Support Prototype.vi differ diff --git a/src/ClientAPI Example/TCPRouter ClientAPI Example 1.1.vi b/src/ClientAPI Example/TCPRouter ClientAPI Example 1.1.vi new file mode 100644 index 0000000..e54a6bd Binary files /dev/null and b/src/ClientAPI Example/TCPRouter ClientAPI Example 1.1.vi differ diff --git a/src/ClientAPI Example/TCPRouter ClientAPI Example 1.2.vi b/src/ClientAPI Example/TCPRouter ClientAPI Example 1.2.vi new file mode 100644 index 0000000..4fd974e Binary files /dev/null and b/src/ClientAPI Example/TCPRouter ClientAPI Example 1.2.vi differ diff --git a/src/ClientAPI Example/TCPRouter ClientAPI Example 1.vi b/src/ClientAPI Example/TCPRouter ClientAPI Example 1.vi deleted file mode 100644 index a874ba9..0000000 Binary files a/src/ClientAPI Example/TCPRouter ClientAPI Example 1.vi and /dev/null differ diff --git a/src/ClientAPI Example/TCPRouter ClientAPI Example 2.vi b/src/ClientAPI Example/TCPRouter ClientAPI Example 2.vi index 60b302b..ce984b8 100644 Binary files a/src/ClientAPI Example/TCPRouter ClientAPI Example 2.vi and b/src/ClientAPI Example/TCPRouter ClientAPI Example 2.vi differ diff --git a/src/ClientAPI Example/TCPRouter ClientAPI Example 3.vi b/src/ClientAPI Example/TCPRouter ClientAPI Example 3.vi index 52a093a..3fa797b 100644 Binary files a/src/ClientAPI Example/TCPRouter ClientAPI Example 3.vi and b/src/ClientAPI Example/TCPRouter ClientAPI Example 3.vi differ diff --git a/src/ClientAPI Example/TCPRouter ClientAPI Example 4.vi b/src/ClientAPI Example/TCPRouter ClientAPI Example 4.vi index 361e4b7..9ef1b4f 100644 Binary files a/src/ClientAPI Example/TCPRouter ClientAPI Example 4.vi and b/src/ClientAPI Example/TCPRouter ClientAPI Example 4.vi differ diff --git a/src/Server/CSM-TCP-Router(Server).vi b/src/Server/CSM-TCP-Router(Server).vi index a265454..515d816 100644 Binary files a/src/Server/CSM-TCP-Router(Server).vi and b/src/Server/CSM-TCP-Router(Server).vi differ diff --git a/src/Server/CSM_Modules/HAL-AI.vi b/src/Server/CSM_Modules/HAL-AI.vi index 319e1ec..048d7ca 100644 Binary files a/src/Server/CSM_Modules/HAL-AI.vi and b/src/Server/CSM_Modules/HAL-AI.vi differ diff --git a/src/Server/CSM_Modules/HAL-DIO.vi b/src/Server/CSM_Modules/HAL-DIO.vi index c3b4411..561bc87 100644 Binary files a/src/Server/CSM_Modules/HAL-DIO.vi and b/src/Server/CSM_Modules/HAL-DIO.vi differ diff --git a/src/Server/CSM_Modules/MAL-TEST.vi b/src/Server/CSM_Modules/MAL-TEST.vi index 36b9718..7ec0ec1 100644 Binary files a/src/Server/CSM_Modules/MAL-TEST.vi and b/src/Server/CSM_Modules/MAL-TEST.vi differ diff --git a/src/_addons/TCP-Router/CSM-TCP-Router.lvlib b/src/_addons/TCP-Router/CSM-TCP-Router.lvlib index 2f28266..4a2bd56 100644 --- a/src/_addons/TCP-Router/CSM-TCP-Router.lvlib +++ b/src/_addons/TCP-Router/CSM-TCP-Router.lvlib @@ -9,14 +9,15 @@ + 3 - + diff --git a/src/_addons/TCP-Router/CSM-TCP-Router.vi b/src/_addons/TCP-Router/CSM-TCP-Router.vi index 90bb0b1..61ba36c 100644 Binary files a/src/_addons/TCP-Router/CSM-TCP-Router.vi and b/src/_addons/TCP-Router/CSM-TCP-Router.vi differ diff --git a/src/_addons/TCP-Router/ClientAPI/ASync-Response Queue.vi b/src/_addons/TCP-Router/ClientAPI/ASync-Response Queue.vi index dc1405f..a40475c 100644 Binary files a/src/_addons/TCP-Router/ClientAPI/ASync-Response Queue.vi and b/src/_addons/TCP-Router/ClientAPI/ASync-Response Queue.vi differ diff --git a/src/_addons/TCP-Router/ClientAPI/ASync-Response User Event.vi b/src/_addons/TCP-Router/ClientAPI/ASync-Response User Event.vi index 8c4155f..c6673ef 100644 Binary files a/src/_addons/TCP-Router/ClientAPI/ASync-Response User Event.vi and b/src/_addons/TCP-Router/ClientAPI/ASync-Response User Event.vi differ diff --git a/src/_addons/TCP-Router/ClientAPI/Ping.vi b/src/_addons/TCP-Router/ClientAPI/Ping.vi index 64f5ff8..d27ec9c 100644 Binary files a/src/_addons/TCP-Router/ClientAPI/Ping.vi and b/src/_addons/TCP-Router/ClientAPI/Ping.vi differ diff --git a/src/_addons/TCP-Router/ClientAPI/Post Message.vi b/src/_addons/TCP-Router/ClientAPI/Post Message.vi index c032590..2873149 100644 Binary files a/src/_addons/TCP-Router/ClientAPI/Post Message.vi and b/src/_addons/TCP-Router/ClientAPI/Post Message.vi differ diff --git a/src/_addons/TCP-Router/ClientAPI/Post No-Rep Message.vi b/src/_addons/TCP-Router/ClientAPI/Post No-Rep Message.vi index b6b7299..7819ed3 100644 Binary files a/src/_addons/TCP-Router/ClientAPI/Post No-Rep Message.vi and b/src/_addons/TCP-Router/ClientAPI/Post No-Rep Message.vi differ diff --git a/src/_addons/TCP-Router/ClientAPI/Register Status Change.vi b/src/_addons/TCP-Router/ClientAPI/Register Status Change.vi index 70f7c7d..771ecbb 100644 Binary files a/src/_addons/TCP-Router/ClientAPI/Register Status Change.vi and b/src/_addons/TCP-Router/ClientAPI/Register Status Change.vi differ diff --git a/src/_addons/TCP-Router/ClientAPI/Register Status for Client.vi b/src/_addons/TCP-Router/ClientAPI/Register Status for Client.vi index ca44cda..0289f02 100644 Binary files a/src/_addons/TCP-Router/ClientAPI/Register Status for Client.vi and b/src/_addons/TCP-Router/ClientAPI/Register Status for Client.vi differ diff --git a/src/_addons/TCP-Router/ClientAPI/Send Message and Wait for Reply.vi b/src/_addons/TCP-Router/ClientAPI/Send Message and Wait for Reply.vi index b360c07..8d50562 100644 Binary files a/src/_addons/TCP-Router/ClientAPI/Send Message and Wait for Reply.vi and b/src/_addons/TCP-Router/ClientAPI/Send Message and Wait for Reply.vi differ diff --git a/src/_addons/TCP-Router/ClientAPI/Status Queue.vi b/src/_addons/TCP-Router/ClientAPI/Status Queue.vi index 1dbb3d6..7b0c472 100644 Binary files a/src/_addons/TCP-Router/ClientAPI/Status Queue.vi and b/src/_addons/TCP-Router/ClientAPI/Status Queue.vi differ diff --git a/src/_addons/TCP-Router/ClientAPI/Unregister Status Change.vi b/src/_addons/TCP-Router/ClientAPI/Unregister Status Change.vi index b2b407b..bf5c5f6 100644 Binary files a/src/_addons/TCP-Router/ClientAPI/Unregister Status Change.vi and b/src/_addons/TCP-Router/ClientAPI/Unregister Status Change.vi differ diff --git a/src/_addons/TCP-Router/ClientAPI/Unregister Status for Client.vi b/src/_addons/TCP-Router/ClientAPI/Unregister Status for Client.vi index 23f6935..0792c20 100644 Binary files a/src/_addons/TCP-Router/ClientAPI/Unregister Status for Client.vi and b/src/_addons/TCP-Router/ClientAPI/Unregister Status for Client.vi differ diff --git a/src/_addons/TCP-Router/ClientAPI/Wait for Server.vi b/src/_addons/TCP-Router/ClientAPI/Wait for Server.vi index 1981d48..936352b 100644 Binary files a/src/_addons/TCP-Router/ClientAPI/Wait for Server.vi and b/src/_addons/TCP-Router/ClientAPI/Wait for Server.vi differ diff --git a/src/_addons/TCP-Router/ClientAPI/_support/ASync-Resp TCP.vi b/src/_addons/TCP-Router/ClientAPI/_support/ASync-Resp TCP.vi index 9ab3db9..ad671a9 100644 Binary files a/src/_addons/TCP-Router/ClientAPI/_support/ASync-Resp TCP.vi and b/src/_addons/TCP-Router/ClientAPI/_support/ASync-Resp TCP.vi differ diff --git a/src/_addons/TCP-Router/ClientAPI/_support/AsyncResp-Background-Thread.vi b/src/_addons/TCP-Router/ClientAPI/_support/AsyncResp-Background-Thread.vi index 5cc2ff0..ff9d734 100644 Binary files a/src/_addons/TCP-Router/ClientAPI/_support/AsyncResp-Background-Thread.vi and b/src/_addons/TCP-Router/ClientAPI/_support/AsyncResp-Background-Thread.vi differ diff --git a/src/_addons/TCP-Router/ClientAPI/_support/REP-REQ TCP.vi b/src/_addons/TCP-Router/ClientAPI/_support/REP-REQ TCP.vi index 8bb9fab..47dd0de 100644 Binary files a/src/_addons/TCP-Router/ClientAPI/_support/REP-REQ TCP.vi and b/src/_addons/TCP-Router/ClientAPI/_support/REP-REQ TCP.vi differ diff --git a/src/_addons/TCP-Router/ClientAPI/_support/Status TCP.vi b/src/_addons/TCP-Router/ClientAPI/_support/Status TCP.vi index af7e33a..daa443d 100644 Binary files a/src/_addons/TCP-Router/ClientAPI/_support/Status TCP.vi and b/src/_addons/TCP-Router/ClientAPI/_support/Status TCP.vi differ diff --git a/src/_addons/TCP-Router/ClientAPI/_support/Status-Background-Thread.vi b/src/_addons/TCP-Router/ClientAPI/_support/Status-Background-Thread.vi index 30c36c6..06e282a 100644 Binary files a/src/_addons/TCP-Router/ClientAPI/_support/Status-Background-Thread.vi and b/src/_addons/TCP-Router/ClientAPI/_support/Status-Background-Thread.vi differ diff --git a/src/_addons/TCP-Router/_support/Connection Handler Worker.vi b/src/_addons/TCP-Router/_support/Connection Handler Worker.vi index 487de8d..54df5c4 100644 Binary files a/src/_addons/TCP-Router/_support/Connection Handler Worker.vi and b/src/_addons/TCP-Router/_support/Connection Handler Worker.vi differ diff --git a/src/_addons/TCP-Router/_support/Error If Module Not Exist.vi b/src/_addons/TCP-Router/_support/Error If Module Not Exist.vi index 86f4f69..1e70480 100644 Binary files a/src/_addons/TCP-Router/_support/Error If Module Not Exist.vi and b/src/_addons/TCP-Router/_support/Error If Module Not Exist.vi differ diff --git a/src/_addons/TCP-Router/_support/Read CSM Doc.vi b/src/_addons/TCP-Router/_support/Read CSM Doc.vi index f090fd8..b61958b 100644 Binary files a/src/_addons/TCP-Router/_support/Read CSM Doc.vi and b/src/_addons/TCP-Router/_support/Read CSM Doc.vi differ diff --git a/src/_addons/TCP-Router/_support/TCP Safe Read.vi b/src/_addons/TCP-Router/_support/TCP Safe Read.vi index e5b5f71..9658750 100644 Binary files a/src/_addons/TCP-Router/_support/TCP Safe Read.vi and b/src/_addons/TCP-Router/_support/TCP Safe Read.vi differ diff --git a/src/_addons/TCP-Router/_support/TCP Send Command Respone.vi b/src/_addons/TCP-Router/_support/TCP Send Command Respone.vi index 82c0a22..01352b0 100644 Binary files a/src/_addons/TCP-Router/_support/TCP Send Command Respone.vi and b/src/_addons/TCP-Router/_support/TCP Send Command Respone.vi differ diff --git a/src/_addons/TCP-Router/_support/TCP Send Info.vi b/src/_addons/TCP-Router/_support/TCP Send Info.vi index 94a2c6f..1a7b09a 100644 Binary files a/src/_addons/TCP-Router/_support/TCP Send Info.vi and b/src/_addons/TCP-Router/_support/TCP Send Info.vi differ diff --git a/src/_addons/TCP-Router/_support/TCP Send Response.vi b/src/_addons/TCP-Router/_support/TCP Send Response.vi index fff1ef2..0d8d332 100644 Binary files a/src/_addons/TCP-Router/_support/TCP Send Response.vi and b/src/_addons/TCP-Router/_support/TCP Send Response.vi differ diff --git a/src/_addons/TCP-Router/_support/pack tcp packet.vi b/src/_addons/TCP-Router/_support/pack tcp packet.vi index ddad972..33c48d4 100644 Binary files a/src/_addons/TCP-Router/_support/pack tcp packet.vi and b/src/_addons/TCP-Router/_support/pack tcp packet.vi differ diff --git a/src/_addons/TCP-Router/_support/unpack tcp packet.vi b/src/_addons/TCP-Router/_support/unpack tcp packet.vi index c58911e..472694c 100644 Binary files a/src/_addons/TCP-Router/_support/unpack tcp packet.vi and b/src/_addons/TCP-Router/_support/unpack tcp packet.vi differ