diff --git a/modules/tmx.hw.N2O-2.vi b/modules/tmx.hw.N2O-2.vi index 484879ffea303128c1c87a01e01d0db0cd8ea763..e236e7d61b5acd018edcacedb0d95063b4053622 100644 Binary files a/modules/tmx.hw.N2O-2.vi and b/modules/tmx.hw.N2O-2.vi differ diff --git a/modules/tmx.hw.cRIO.vi b/modules/tmx.hw.cRIO.vi index 30b2ade59253334374d2142769e0486c5bcab922..a00284fa0f6651cbf3c919e6b5fcd08d98d75769 100644 Binary files a/modules/tmx.hw.cRIO.vi and b/modules/tmx.hw.cRIO.vi differ diff --git a/modules/tmx.json.clear.errors.vi b/modules/tmx.json.clear.errors.vi index b2d937a6b8807573ee07c3614bab4a8e1ea0fb68..ed8ce87643739312adcbda457576a45d2bdd149d 100644 Binary files a/modules/tmx.json.clear.errors.vi and b/modules/tmx.json.clear.errors.vi differ diff --git a/modules/tmx.json.command.vi b/modules/tmx.json.command.vi index 482595b6baa6ac3349add1247492b91f40dd6061..bf8aa01c0a93cfa3257ba5a045f3af093c3436a4 100644 Binary files a/modules/tmx.json.command.vi and b/modules/tmx.json.command.vi differ diff --git a/modules/tmx.json.read.cvt.vi b/modules/tmx.json.read.cvt.vi index ed5a0ffe3697e04e4469c79d390ce85b14b9d0b6..5d0a0358c461a62cfba614eb3fd33b72141eee62 100644 Binary files a/modules/tmx.json.read.cvt.vi and b/modules/tmx.json.read.cvt.vi differ diff --git a/modules/tmx.json.read.errors.vi b/modules/tmx.json.read.errors.vi index 8f0411eae87c3bf1006aedff0314f24a285f985a..540196a2300177b81ab5fd51a2694dcdca6f54a3 100644 Binary files a/modules/tmx.json.read.errors.vi and b/modules/tmx.json.read.errors.vi differ diff --git a/modules/tmx.json.write.actchannel.vi b/modules/tmx.json.write.actchannel.vi index 684904265db442099089b443ec1390e9c4a020e1..d95a7a63e63875f29567cbd7af0e6318a9fa6b00 100644 Binary files a/modules/tmx.json.write.actchannel.vi and b/modules/tmx.json.write.actchannel.vi differ diff --git a/modules/tmx.json.write.recipe.vi b/modules/tmx.json.write.recipe.vi index 1f0db8bf47bc0980eb0731bacf3ad2d96419c760..685e9efa866639a989c80565e1614ddd8f6ba060 100644 Binary files a/modules/tmx.json.write.recipe.vi and b/modules/tmx.json.write.recipe.vi differ diff --git a/modules/tmx.server.afp.vi b/modules/tmx.server.afp.vi index 0c48e34dd440f770e799c12b5bd08ff1b56fc959..3c31296bcd9aeade9c16abc5e2c94112147fbb91 100644 Binary files a/modules/tmx.server.afp.vi and b/modules/tmx.server.afp.vi differ diff --git a/modules/tmx.server.json.vi b/modules/tmx.server.json.vi index 293b8c6b6d70b11fb546d793b086929f386ed6e7..6519d1900a89d2b00f6103878b23b6e0ef6c0ee4 100644 Binary files a/modules/tmx.server.json.vi and b/modules/tmx.server.json.vi differ diff --git a/test/websocket/Python/websockettest.py b/test/websocket/Python/websockettest.py new file mode 100644 index 0000000000000000000000000000000000000000..6e1a5172a9c6733e7c26c3d1c8f4cff9ab1be6af --- /dev/null +++ b/test/websocket/Python/websockettest.py @@ -0,0 +1,9 @@ +import asyncio +import websockets + +async def test(): + async with websockets.connect('://localhost:2629') as websocket: + websocket.send('test msg') + msg = await websocket.recv() + print(f"From Server: {msg}") +asyncio.get_event_loop().run_until_complete(test()) diff --git a/test/websocket/Python/websockettest2.py b/test/websocket/Python/websockettest2.py new file mode 100644 index 0000000000000000000000000000000000000000..7b2d97fd9277944679f240d1e2742024cdc9b6aa --- /dev/null +++ b/test/websocket/Python/websockettest2.py @@ -0,0 +1,17 @@ +import asyncio +import websockets +import json + +msg = {"Command":"Read.CVT"} +# msg = {"Command":"Read.Errors"} +# msg = {"Command":"Clear.Errors"} +# msg = {"Command":"Write.ActChannel","Act. channel":5} +# msg = {"Command":"Write.Recipe","Recipe":[[1,0,11],[0,0,12],[2,0,13],[1,0,14]]} +# msg = {"Command":"Debug"} + +async def call_api(msg): + async with websockets.connect('ws://10.50.44.238:2629') as websocket: + await websocket.send(msg) + response = await websocket.recv() + print(response) +asyncio.get_event_loop().run_until_complete(call_api(json.dumps(msg))) \ No newline at end of file diff --git a/test/websocket/websocket client test.vi b/test/websocket/websocket client test.vi index 6c3e9444d28054a84c9b295e1b524921f702b09c..b14318f60b8cee621c702ab33d47863902bcb2f0 100644 Binary files a/test/websocket/websocket client test.vi and b/test/websocket/websocket client test.vi differ diff --git a/tumux.iak b/tumux.iak index 0df3d47669e2e8f40b921e7bac186460fab92c4d..52bccfcce0d3aa43edc7f6de89b191ea5696f72b 100644 Binary files a/tumux.iak and b/tumux.iak differ diff --git a/tumux.lvlps b/tumux.lvlps index 69e81f973d414dc94ab78d47093b5bdd909c031b..ff73afa3eb3f24b0df08e69022d109c75a1497ec 100644 --- a/tumux.lvlps +++ b/tumux.lvlps @@ -1,5 +1,5 @@ [ProjectWindow_Data] -ProjectExplorer.ClassicPosition[String] = "166,1933,1069,2360" +ProjectExplorer.ClassicPosition[String] = "209,1967,1112,2394" [AB_Cache_{0756750E-B4E8-4BF3-82A3-64077D79CBC8}] Cache_Path[Path] Line0001 = "/C/Users/dgeerts/AppData/Local/Temp/AB_Cache_{0756" @@ -65,14 +65,6 @@ Cache_Path[Path] Line0002 = "EFBD-E0A6-49D5-A022-49D24CDC5963}.txt" Cache_Path[Path] Line0001 = "/C/Users/dgeerts/AppData/Local/Temp/AB_Cache_{BC9A" Cache_Path[Path] Line0002 = "7945-DC7A-4D6B-8655-F354D97C98E4}.txt" -[AB_Cache_{86B3B92D-CED4-404C-B6DE-D76A94737DEE}] -Cache_Path[Path] Line0001 = "/C/Users/dgeerts/AppData/Local/Temp/AB_Cache_{86B3" -Cache_Path[Path] Line0002 = "B92D-CED4-404C-B6DE-D76A94737DEE}.txt" - -[AB_Cache_{BC18E29A-3C28-4235-912C-852E130379D5}] -Cache_Path[Path] Line0001 = "/C/Users/dgeerts/AppData/Local/Temp/AB_Cache_{BC18" -Cache_Path[Path] Line0002 = "E29A-3C28-4235-912C-852E130379D5}.txt" - [AB_Cache_{C88B97DE-1D53-40B7-8A9D-7223F5200C59}] Cache_Path[Path] Line0001 = "/C/Users/dgeerts/AppData/Local/Temp/AB_Cache_{C88B" Cache_Path[Path] Line0002 = "97DE-1D53-40B7-8A9D-7223F5200C59}.txt" @@ -105,3 +97,11 @@ Cache_Path[Path] Line0002 = "65E5-8814-4D90-A29A-B6A1C1434648}.txt" Cache_Path[Path] Line0001 = "/C/Users/dgeerts/AppData/Local/Temp/AB_Cache_{1E71" Cache_Path[Path] Line0002 = "8B13-4A58-4E49-AEEB-0F854516A69C}.txt" +[AB_Cache_{86B3B92D-CED4-404C-B6DE-D76A94737DEE}] +Cache_Path[Path] Line0001 = "/C/Users/dgeerts/AppData/Local/Temp/AB_Cache_{86B3" +Cache_Path[Path] Line0002 = "B92D-CED4-404C-B6DE-D76A94737DEE}.txt" + +[AB_Cache_{BC18E29A-3C28-4235-912C-852E130379D5}] +Cache_Path[Path] Line0001 = "/C/Users/dgeerts/AppData/Local/Temp/AB_Cache_{BC18" +Cache_Path[Path] Line0002 = "E29A-3C28-4235-912C-852E130379D5}.txt" + diff --git a/tumux.lvproj b/tumux.lvproj index 9999139ea9c6089c41f29a3e45250555f090bc0a..3bdcb5b4893f1286518306aaf644d6403264c0d9 100644 Binary files a/tumux.lvproj and b/tumux.lvproj differ diff --git a/tumux.vi b/tumux.vi index 5fccf7b80da0d8b2d4c9b9af78522b7048b0c38b..fff02d3de7b7560b1ec21dd1de8fdeef9b84e7b3 100644 Binary files a/tumux.vi and b/tumux.vi differ