Skip to content
This repository was archived by the owner on Jun 21, 2024. It is now read-only.

Commit 68d74a1

Browse files
authored
Merge pull request #7 from Mobject-Dev-Team/pre-v0.7.0
0.7.0
2 parents 43bc9f8 + 60a3708 commit 68d74a1

File tree

11 files changed

+24
-19
lines changed

11 files changed

+24
-19
lines changed

docs/changelog.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,10 @@
11
# Changelog
22

3+
## v0.7.0-alpha
4+
5+
- added support for mobject-server v0.7.0
6+
- changed api to now support plc cycle "async" processing
7+
38
## v0.6.0-alpha
49

510
- added support for mobject-graph v0.5.0

mobject-graph-api.library

2.27 KB
Binary file not shown.

src/mobject-graph-api/mobject-graph-api-test-project/Main/Main.plcproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@
4848
</PlaceholderReference>
4949
</ItemGroup>
5050
<ItemGroup>
51-
<LibraryReference Include="mobject-graph-api,0.6.0,mobject">
51+
<LibraryReference Include="mobject-graph-api,0.7.0,mobject">
5252
<Namespace>mobject_graph_api</Namespace>
5353
</LibraryReference>
5454
</ItemGroup>

src/mobject-graph-api/mobject-graph-api-test-project/_Config/PLC/Main.xti

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0"?>
22
<TcSmItem xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://www.beckhoff.com/schemas/2012/07/TcSmProject" TcSmVersion="1.0" TcVersion="3.1.4024.55" ClassName="CNestedPlcProjDef">
33
<Project GUID="{8EC8A461-508C-4754-B972-031F1158B5D7}" Name="Main" PrjFilePath="..\..\Main\Main.plcproj" TmcFilePath="..\..\Main\Main.tmc" ReloadTmc="true" AmsPort="851" FileArchiveSettings="#x000e" SymbolicMapping="true">
4-
<Instance Id="#x08502000" TcSmClass="TComPlcObjDef" KeepUnrestoredLinks="2" TmcPath="Main\Main.tmc" TmcHash="{12F673DB-5C00-063E-45F8-FCFE04C0D421}">
4+
<Instance Id="#x08502000" TcSmClass="TComPlcObjDef" KeepUnrestoredLinks="2" TmcPath="Main\Main.tmc" TmcHash="{0300A74E-EBDF-24A5-1EDE-DF893F3FF86F}">
55
<Name>Main Instance</Name>
66
<CLSID ClassFactory="TcPlc30">{08500001-0000-0000-F000-000000000064}</CLSID>
77
<Contexts>

src/mobject-graph-api/mobject-graph-api/mobject-graph-api/GraphApi.TcPOU

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -100,11 +100,11 @@ VAR_INPUT
100100
END_VAR
101101
]]></Declaration>
102102
<Implementation>
103-
<ST><![CDATA[Server.RegisterRpcHandler('CreateGraph',createGraphRpcHandler);
104-
Server.RegisterRpcHandler('CreateGraphMultiUser',createGraphMultiUserRpcHandler);
105-
Server.RegisterRpcHandler('GetStatus',getStatusRpcHandler);
106-
Server.RegisterRpcHandler('GetBlueprints',getBlueprintsRpcHandler);
107-
Server.RegisterRpcHandler('GetContentValue',getContentValueHandler);]]></ST>
103+
<ST><![CDATA[Server.RegisterAsynchronousRpcHandler('CreateGraph',createGraphRpcHandler);
104+
Server.RegisterAsynchronousRpcHandler('CreateGraphMultiUser',createGraphMultiUserRpcHandler);
105+
Server.RegisterAsynchronousRpcHandler('GetStatus',getStatusRpcHandler);
106+
Server.RegisterAsynchronousRpcHandler('GetBlueprints',getBlueprintsRpcHandler);
107+
Server.RegisterAsynchronousRpcHandler('GetContentValue',getContentValueHandler);]]></ST>
108108
</Implementation>
109109
</Method>
110110
</POU>

src/mobject-graph-api/mobject-graph-api/mobject-graph-api/_Internal/Handlers/CreateGraphMultiUserRpcHandler.TcPOU

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<Declaration><![CDATA[{attribute 'linkalways'}
55
{attribute 'no_explicit_call' := 'This FB is a CLASS and must be accessed using methods or properties'}
66
{attribute 'enable_dynamic_creation'}
7-
FUNCTION_BLOCK CreateGraphMultiUserRpcHandler IMPLEMENTS I_RpcHandler
7+
FUNCTION_BLOCK CreateGraphMultiUserRpcHandler IMPLEMENTS I_AsynchronousRpcHandler
88
VAR
99
graphFramework : I_GraphFramework;
1010
graphs : I_Graphs;
@@ -18,7 +18,7 @@ END_VAR
1818
<Declaration><![CDATA[METHOD Handle
1919
VAR_INPUT
2020
Parameters : I_Deserializer;
21-
Response : I_SynchronousRpcResponse;
21+
Response : I_AsynchronousRpcResponse;
2222
END_VAR
2323
VAR
2424
clientId : T_MAXSTRING;

src/mobject-graph-api/mobject-graph-api/mobject-graph-api/_Internal/Handlers/CreateGraphRpcHandler.TcPOU

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<Declaration><![CDATA[{attribute 'linkalways'}
55
{attribute 'no_explicit_call' := 'This FB is a CLASS and must be accessed using methods or properties'}
66
{attribute 'enable_dynamic_creation'}
7-
FUNCTION_BLOCK CreateGraphRpcHandler IMPLEMENTS I_RpcHandler
7+
FUNCTION_BLOCK CreateGraphRpcHandler IMPLEMENTS I_AsynchronousRpcHandler
88
VAR
99
graphFramework : I_GraphFramework;
1010
graphs : I_Graphs;
@@ -18,7 +18,7 @@ END_VAR
1818
<Declaration><![CDATA[METHOD Handle
1919
VAR_INPUT
2020
Parameters : I_Deserializer;
21-
Response : I_SynchronousRpcResponse;
21+
Response : I_AsynchronousRpcResponse;
2222
END_VAR
2323
VAR
2424
graph : I_Graph;

src/mobject-graph-api/mobject-graph-api/mobject-graph-api/_Internal/Handlers/GetBlueprintsRpcHandler.TcPOU

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<Declaration><![CDATA[{attribute 'linkalways'}
55
{attribute 'no_explicit_call' := 'This FB is a CLASS and must be accessed using methods or properties'}
66
{attribute 'enable_dynamic_creation'}
7-
FUNCTION_BLOCK GetBlueprintsRpcHandler IMPLEMENTS I_RpcHandler
7+
FUNCTION_BLOCK GetBlueprintsRpcHandler IMPLEMENTS I_AsynchronousRpcHandler
88
VAR
99
nodeFactory : I_NodeFactory;
1010
END_VAR
@@ -16,7 +16,7 @@ END_VAR
1616
<Declaration><![CDATA[METHOD Handle
1717
VAR_INPUT
1818
Parameters : I_Deserializer;
19-
Response : I_SynchronousRpcResponse;
19+
Response : I_AsynchronousRpcResponse;
2020
END_VAR
2121
VAR
2222
visitor : GetBlueprintsVisitor;

src/mobject-graph-api/mobject-graph-api/mobject-graph-api/_Internal/Handlers/GetContentValueHandler.TcPOU

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<Declaration><![CDATA[{attribute 'linkalways'}
55
{attribute 'no_explicit_call' := 'This FB is a CLASS and must be accessed using methods or properties'}
66
{attribute 'enable_dynamic_creation'}
7-
FUNCTION_BLOCK GetContentValueHandler IMPLEMENTS I_RpcHandler
7+
FUNCTION_BLOCK GetContentValueHandler IMPLEMENTS I_AsynchronousRpcHandler
88
VAR
99
graphs : I_Graphs;
1010
END_VAR
@@ -16,7 +16,7 @@ END_VAR
1616
<Declaration><![CDATA[METHOD Handle
1717
VAR_INPUT
1818
Parameters : I_Deserializer;
19-
Response : I_SynchronousRpcResponse;
19+
Response : I_AsynchronousRpcResponse;
2020
END_VAR
2121
VAR
2222
graphUuid : T_MAXSTRING;

src/mobject-graph-api/mobject-graph-api/mobject-graph-api/_Internal/Handlers/GetStatusRpcHandler.TcPOU

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<Declaration><![CDATA[{attribute 'linkalways'}
55
{attribute 'no_explicit_call' := 'This FB is a CLASS and must be accessed using methods or properties'}
66
{attribute 'enable_dynamic_creation'}
7-
FUNCTION_BLOCK GetStatusRpcHandler IMPLEMENTS I_RpcHandler
7+
FUNCTION_BLOCK GetStatusRpcHandler IMPLEMENTS I_AsynchronousRpcHandler
88
VAR
99
graphs : I_Graphs;
1010
END_VAR
@@ -16,7 +16,7 @@ END_VAR
1616
<Declaration><![CDATA[METHOD Handle
1717
VAR_INPUT
1818
Parameters : I_Deserializer;
19-
Response : I_SynchronousRpcResponse;
19+
Response : I_AsynchronousRpcResponse;
2020
END_VAR
2121
VAR
2222
graphUuid : T_MAXSTRING;

0 commit comments

Comments
 (0)