You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@plc4x.apache.org by cd...@apache.org on 2022/08/24 16:12:21 UTC
[plc4x] 12/12: chore(protocols/plc4x): Finetuning of the plc4x protocol to avoid naming collisions
This is an automated email from the ASF dual-hosted git repository.
cdutz pushed a commit to branch feature/ads-symbol-discovery
in repository https://gitbox.apache.org/repos/asf/plc4x.git
commit 42c119505b4c70f82d8d884c9f527f5efc115856
Author: Christofer Dutz <ch...@rivian.com>
AuthorDate: Wed Aug 24 18:11:59 2022 +0200
chore(protocols/plc4x): Finetuning of the plc4x protocol to avoid naming collisions
---
.../main/resources/protocols/plc4x/v0/plc4x.mspec | 32 +++++++++++-----------
1 file changed, 16 insertions(+), 16 deletions(-)
diff --git a/protocols/plc4x/src/main/resources/protocols/plc4x/v0/plc4x.mspec b/protocols/plc4x/src/main/resources/protocols/plc4x/v0/plc4x.mspec
index 3120a1c98..37592e4d3 100644
--- a/protocols/plc4x/src/main/resources/protocols/plc4x/v0/plc4x.mspec
+++ b/protocols/plc4x/src/main/resources/protocols/plc4x/v0/plc4x.mspec
@@ -33,7 +33,7 @@
]
['CONNECT_RESPONSE' Plc4xConnectResponse
[simple uint 16 connectionId ]
- [simple PlcResponseCode responseCode ]
+ [simple Plc4xResponseCode responseCode ]
]
['READ_REQUEST' Plc4xReadRequest
[simple uint 16 connectionId ]
@@ -42,7 +42,7 @@
]
['READ_RESPONSE' Plc4xReadResponse
[simple uint 16 connectionId ]
- [simple PlcResponseCode responseCode ]
+ [simple Plc4xResponseCode responseCode ]
[implicit uint 8 numFields 'COUNT(fields)' ]
[array Plc4xFieldValueResponse fields count 'numFields']
]
@@ -53,7 +53,7 @@
]
['WRITE_RESPONSE' Plc4xWriteResponse
[simple uint 16 connectionId ]
- [simple PlcResponseCode responseCode ]
+ [simple Plc4xResponseCode responseCode ]
[implicit uint 8 numFields 'COUNT(fields)' ]
[array Plc4xFieldResponse fields count 'numFields']
]
@@ -76,7 +76,7 @@
]
['UNSUBSCRIPTION_RESPONSE' Plc4xUnsubscriptionResponse
[simple uint 16 connectionId ]
- [simple PlcResponseCode responseCode ]
+ [simple Plc4xResponseCode responseCode ]
[implicit uint 8 numFields 'COUNT(fields)' ]
[array fields count 'numFields']
]*/
@@ -95,24 +95,24 @@
]
[type Plc4xFieldValueRequest
- [simple Plc4xField field ]
- [simple PlcValueType valueType ]
- [optional Plc4xValue('valueType') value 'valueType != PlcValueType.NULL']
+ [simple Plc4xField field ]
+ [simple Plc4xValueType valueType ]
+ [optional Plc4xValue('valueType') value 'valueType != Plc4xValueType.NULL']
]
[type Plc4xFieldResponse
[simple Plc4xField field ]
- [simple PlcResponseCode responseCode]
+ [simple Plc4xResponseCode responseCode]
]
[type Plc4xFieldValueResponse
- [simple Plc4xField field ]
- [simple PlcResponseCode responseCode ]
- [simple PlcValueType valueType ]
- [optional Plc4xValue('valueType') value 'valueType != PlcValueType.NULL']
+ [simple Plc4xField field ]
+ [simple Plc4xResponseCode responseCode ]
+ [simple Plc4xValueType valueType ]
+ [optional Plc4xValue('valueType') value 'valueType != Plc4xValueType.NULL']
]
-[dataIo Plc4xValue(PlcValueType valueType)
+[dataIo Plc4xValue(Plc4xValueType valueType)
[typeSwitch valueType
// Bit Strings
['BOOL' BOOL
@@ -211,7 +211,7 @@
['0x0C' UNSUBSCRIPTION_RESPONSE]
]
-[enum uint 8 PlcResponseCode
+[enum uint 8 Plc4xResponseCode
['0x01' OK ]
['0x02' NOT_FOUND ]
['0x03' ACCESS_DENIED ]
@@ -225,7 +225,7 @@
['0x0C' RESPONSE_PENDING]
]
-[enum uint 8 PlcValueType
+[enum uint 8 Plc4xValueType
['0x00' NULL ]
// Bit Strings
@@ -274,7 +274,7 @@
['0x71' RAW_BYTE_ARRAY]
]
-[enum uint 8 PlcSubscriptionType
+[enum uint 8 Plc4xSubscriptionType
['0x01' CYCLIC ]
['0x02' CHANGE_OF_STATE]
['0x03' EVENT ]