You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@plc4x.apache.org by "glcj (via GitHub)" <gi...@apache.org> on 2024/02/12 15:25:45 UTC
[PR] Corrects the call to generate events that were commented. Tests again…
glcj opened a new pull request, #1400:
URL: https://github.com/apache/plc4x/pull/1400
Corrects call to generate asynchronous events for the S7 driver.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: dev-unsubscribe@plc4x.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
Re: [PR] Corrects the call to generate events that were commented. Tests again…
Posted by "sruehl (via GitHub)" <gi...@apache.org>.
sruehl commented on code in PR #1400:
URL: https://github.com/apache/plc4x/pull/1400#discussion_r1486391136
##########
plc4j/drivers/s7/src/main/java/org/apache/plc4x/java/s7/readwrite/protocol/S7ProtocolLogic.java:
##########
@@ -1448,54 +1452,86 @@ private CompletableFuture<S7Message> sendInternal(S7Message request) {
}
/**
- * This method is only called when there is no Response Handler.
+ * DECODE:
+ * This method is called when there is no handler for the message.
+ * By default it must correspond to asynchronous events, which if so,
+ * must be transferred to the event queue.
+ *
+ * The event's own information is encapsulated in the parameters and payload
+ * field. From this it is abstracted to the corresponding event model.
+ *
+ * 01. S7ModeEvent:
+ * 02. S7UserEvent:
+ * 03. S7SysEvent:
+ * 04. S7CyclicEvent:
+ *
+ * TODO: Use mspec to generate types that allow better interpretation of
+ * the code using "instanceof".
*/
@Override
protected void decode(ConversationContext<TPKTPacket> context, TPKTPacket msg) throws Exception {
-
- S7Message s7msg = msg.getPayload().getPayload();
- S7Parameter parameter = s7msg.getParameter();
- if (parameter instanceof S7ParameterModeTransition) {
- // TODO: The eventQueue is only drained in the S7ProtocolEventLogic.ObjectProcessor and here only messages of type S7Event are processed, so S7PayloadUserDataItem elements will just be ignored.
- //eventQueue.add(parameter);
+ System.out.println(msg);
+ final S7Message s7msg = msg.getPayload().getPayload();
+ final S7Parameter parameter = s7msg.getParameter();
+ final S7PayloadUserData payload = (S7PayloadUserData) s7msg.getPayload();
+
+ if (parameter instanceof S7ParameterModeTransition) { //(01)
+
+ S7ModeEvent modeEvent = new S7ModeEvent((S7ParameterModeTransition) parameter);
+ eventQueue.add(modeEvent);
+
} else if (parameter instanceof S7ParameterUserData) {
+
S7ParameterUserData parameterUD = (S7ParameterUserData) parameter;
List<S7ParameterUserDataItem> parameterUDItems = parameterUD.getItems();
+
for (S7ParameterUserDataItem parameterUDItem : parameterUDItems) {
+
if (parameterUDItem instanceof S7ParameterUserDataItemCPUFunctions) {
+
Review Comment:
why are there so many empty lines now?
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: dev-unsubscribe@plc4x.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
Re: [PR] Corrects the call to generate events that were commented. Tests again…
Posted by "glcj (via GitHub)" <gi...@apache.org>.
glcj commented on code in PR #1400:
URL: https://github.com/apache/plc4x/pull/1400#discussion_r1486643074
##########
plc4j/drivers/s7/src/main/java/org/apache/plc4x/java/s7/readwrite/protocol/S7ProtocolLogic.java:
##########
@@ -1448,54 +1452,86 @@ private CompletableFuture<S7Message> sendInternal(S7Message request) {
}
/**
- * This method is only called when there is no Response Handler.
+ * DECODE:
+ * This method is called when there is no handler for the message.
+ * By default it must correspond to asynchronous events, which if so,
+ * must be transferred to the event queue.
+ *
+ * The event's own information is encapsulated in the parameters and payload
+ * field. From this it is abstracted to the corresponding event model.
+ *
+ * 01. S7ModeEvent:
+ * 02. S7UserEvent:
+ * 03. S7SysEvent:
+ * 04. S7CyclicEvent:
+ *
+ * TODO: Use mspec to generate types that allow better interpretation of
+ * the code using "instanceof".
*/
@Override
protected void decode(ConversationContext<TPKTPacket> context, TPKTPacket msg) throws Exception {
-
- S7Message s7msg = msg.getPayload().getPayload();
- S7Parameter parameter = s7msg.getParameter();
- if (parameter instanceof S7ParameterModeTransition) {
- // TODO: The eventQueue is only drained in the S7ProtocolEventLogic.ObjectProcessor and here only messages of type S7Event are processed, so S7PayloadUserDataItem elements will just be ignored.
- //eventQueue.add(parameter);
+ System.out.println(msg);
+ final S7Message s7msg = msg.getPayload().getPayload();
+ final S7Parameter parameter = s7msg.getParameter();
+ final S7PayloadUserData payload = (S7PayloadUserData) s7msg.getPayload();
+
+ if (parameter instanceof S7ParameterModeTransition) { //(01)
+
+ S7ModeEvent modeEvent = new S7ModeEvent((S7ParameterModeTransition) parameter);
+ eventQueue.add(modeEvent);
+
} else if (parameter instanceof S7ParameterUserData) {
+
S7ParameterUserData parameterUD = (S7ParameterUserData) parameter;
List<S7ParameterUserDataItem> parameterUDItems = parameterUD.getItems();
+
for (S7ParameterUserDataItem parameterUDItem : parameterUDItems) {
+
if (parameterUDItem instanceof S7ParameterUserDataItemCPUFunctions) {
+
S7ParameterUserDataItemCPUFunctions myParameter = (S7ParameterUserDataItemCPUFunctions) parameterUDItem;
- //TODO: Check from mspec. We can try using "instanceof"
- if ((myParameter.getCpuFunctionType() == 0x00) && (myParameter.getCpuSubfunction() == 0x03)) {
- S7PayloadUserData payload = (S7PayloadUserData) s7msg.getPayload();
- List<S7PayloadUserDataItem> items = payload.getItems();
- for (S7PayloadUserDataItem item : items) {
+
+ if ((myParameter.getCpuFunctionType() == 0x00) && (myParameter.getCpuSubfunction() == 0x03)) { //(02)
+
+ payload.getItems().forEach(item ->{
if (item instanceof S7PayloadDiagnosticMessage) {
- // TODO: The eventQueue is only drained in the S7ProtocolEventLogic.ObjectProcessor and here only messages of type S7Event are processed, so S7PayloadUserDataItem elements will just be ignored.
- //eventQueue.add(item);
- }
- }
+ final S7PayloadDiagnosticMessage pload = (S7PayloadDiagnosticMessage) item;
+ if ((pload.getEventId() >= 0x0A000) & (pload.getEventId() <= 0x0BFFF)) {
+ S7UserEvent userEvent = new S7UserEvent(pload);
+ eventQueue.add(userEvent);
+ } else {
+ S7SysEvent sysEvent = new S7SysEvent(pload);
+ eventQueue.add(sysEvent);
+ }
+ }
+ });
+
} else if ((myParameter.getCpuFunctionType() == 0x00) &&
((myParameter.getCpuSubfunction() == 0x05) ||
(myParameter.getCpuSubfunction() == 0x06) ||
(myParameter.getCpuSubfunction() == 0x0c) ||
(myParameter.getCpuSubfunction() == 0x11) ||
(myParameter.getCpuSubfunction() == 0x12) ||
(myParameter.getCpuSubfunction() == 0x13) ||
- (myParameter.getCpuSubfunction() == 0x16))) {
- S7PayloadUserData payload = (S7PayloadUserData) s7msg.getPayload();
- List<S7PayloadUserDataItem> items = payload.getItems();
- // TODO: The eventQueue is only drained in the S7ProtocolEventLogic.ObjectProcessor and here only messages of type S7Event are processed, so S7PayloadUserDataItem elements will just be ignored.
- //eventQueue.addAll(items);
+ (myParameter.getCpuSubfunction() == 0x16))) { //(04)
+
+ payload.getItems().forEach(item ->{
+ //if (item instanceof S7PayloadDiagnosticMessage) {
Review Comment:
Hello, thanks for the comments
1. println, was removed.
2. The separated lines are for my better reading of the code.
3. The commented lines were removed.
4. Added "TODO:" in code sections that require reverse engineering.
Grateful,
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: dev-unsubscribe@plc4x.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
Re: [PR] Corrects the call to generate events that were commented. Tests again…
Posted by "glcj (via GitHub)" <gi...@apache.org>.
glcj merged PR #1400:
URL: https://github.com/apache/plc4x/pull/1400
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: dev-unsubscribe@plc4x.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
Re: [PR] Corrects the call to generate events that were commented. Tests again…
Posted by "chrisdutz (via GitHub)" <gi...@apache.org>.
chrisdutz commented on PR #1400:
URL: https://github.com/apache/plc4x/pull/1400#issuecomment-1938895327
Had a look and it seems all changes only have an effect on the Event-based PLCs ... none of which I have. So I have no objections to merging this as is ;-)
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: dev-unsubscribe@plc4x.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
Re: [PR] Corrects the call to generate events that were commented. Tests again…
Posted by "sruehl (via GitHub)" <gi...@apache.org>.
sruehl commented on code in PR #1400:
URL: https://github.com/apache/plc4x/pull/1400#discussion_r1486392383
##########
plc4j/drivers/s7/src/main/java/org/apache/plc4x/java/s7/readwrite/protocol/S7ProtocolLogic.java:
##########
@@ -1448,54 +1452,86 @@ private CompletableFuture<S7Message> sendInternal(S7Message request) {
}
/**
- * This method is only called when there is no Response Handler.
+ * DECODE:
+ * This method is called when there is no handler for the message.
+ * By default it must correspond to asynchronous events, which if so,
+ * must be transferred to the event queue.
+ *
+ * The event's own information is encapsulated in the parameters and payload
+ * field. From this it is abstracted to the corresponding event model.
+ *
+ * 01. S7ModeEvent:
+ * 02. S7UserEvent:
+ * 03. S7SysEvent:
+ * 04. S7CyclicEvent:
+ *
+ * TODO: Use mspec to generate types that allow better interpretation of
+ * the code using "instanceof".
*/
@Override
protected void decode(ConversationContext<TPKTPacket> context, TPKTPacket msg) throws Exception {
-
- S7Message s7msg = msg.getPayload().getPayload();
- S7Parameter parameter = s7msg.getParameter();
- if (parameter instanceof S7ParameterModeTransition) {
- // TODO: The eventQueue is only drained in the S7ProtocolEventLogic.ObjectProcessor and here only messages of type S7Event are processed, so S7PayloadUserDataItem elements will just be ignored.
- //eventQueue.add(parameter);
+ System.out.println(msg);
+ final S7Message s7msg = msg.getPayload().getPayload();
+ final S7Parameter parameter = s7msg.getParameter();
+ final S7PayloadUserData payload = (S7PayloadUserData) s7msg.getPayload();
+
+ if (parameter instanceof S7ParameterModeTransition) { //(01)
+
+ S7ModeEvent modeEvent = new S7ModeEvent((S7ParameterModeTransition) parameter);
+ eventQueue.add(modeEvent);
+
} else if (parameter instanceof S7ParameterUserData) {
+
S7ParameterUserData parameterUD = (S7ParameterUserData) parameter;
List<S7ParameterUserDataItem> parameterUDItems = parameterUD.getItems();
+
for (S7ParameterUserDataItem parameterUDItem : parameterUDItems) {
+
if (parameterUDItem instanceof S7ParameterUserDataItemCPUFunctions) {
+
S7ParameterUserDataItemCPUFunctions myParameter = (S7ParameterUserDataItemCPUFunctions) parameterUDItem;
- //TODO: Check from mspec. We can try using "instanceof"
- if ((myParameter.getCpuFunctionType() == 0x00) && (myParameter.getCpuSubfunction() == 0x03)) {
- S7PayloadUserData payload = (S7PayloadUserData) s7msg.getPayload();
- List<S7PayloadUserDataItem> items = payload.getItems();
- for (S7PayloadUserDataItem item : items) {
+
+ if ((myParameter.getCpuFunctionType() == 0x00) && (myParameter.getCpuSubfunction() == 0x03)) { //(02)
+
+ payload.getItems().forEach(item ->{
if (item instanceof S7PayloadDiagnosticMessage) {
- // TODO: The eventQueue is only drained in the S7ProtocolEventLogic.ObjectProcessor and here only messages of type S7Event are processed, so S7PayloadUserDataItem elements will just be ignored.
- //eventQueue.add(item);
- }
- }
+ final S7PayloadDiagnosticMessage pload = (S7PayloadDiagnosticMessage) item;
+ if ((pload.getEventId() >= 0x0A000) & (pload.getEventId() <= 0x0BFFF)) {
+ S7UserEvent userEvent = new S7UserEvent(pload);
+ eventQueue.add(userEvent);
+ } else {
+ S7SysEvent sysEvent = new S7SysEvent(pload);
+ eventQueue.add(sysEvent);
+ }
+ }
+ });
+
} else if ((myParameter.getCpuFunctionType() == 0x00) &&
((myParameter.getCpuSubfunction() == 0x05) ||
(myParameter.getCpuSubfunction() == 0x06) ||
(myParameter.getCpuSubfunction() == 0x0c) ||
(myParameter.getCpuSubfunction() == 0x11) ||
(myParameter.getCpuSubfunction() == 0x12) ||
(myParameter.getCpuSubfunction() == 0x13) ||
- (myParameter.getCpuSubfunction() == 0x16))) {
- S7PayloadUserData payload = (S7PayloadUserData) s7msg.getPayload();
- List<S7PayloadUserDataItem> items = payload.getItems();
- // TODO: The eventQueue is only drained in the S7ProtocolEventLogic.ObjectProcessor and here only messages of type S7Event are processed, so S7PayloadUserDataItem elements will just be ignored.
- //eventQueue.addAll(items);
+ (myParameter.getCpuSubfunction() == 0x16))) { //(04)
+
+ payload.getItems().forEach(item ->{
+ //if (item instanceof S7PayloadDiagnosticMessage) {
Review Comment:
is it supposed to be outcommented?
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: dev-unsubscribe@plc4x.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
Re: [PR] Corrects the call to generate events that were commented. Tests again…
Posted by "sruehl (via GitHub)" <gi...@apache.org>.
sruehl commented on code in PR #1400:
URL: https://github.com/apache/plc4x/pull/1400#discussion_r1486390597
##########
plc4j/drivers/s7/src/main/java/org/apache/plc4x/java/s7/readwrite/protocol/S7ProtocolLogic.java:
##########
@@ -1448,54 +1452,86 @@ private CompletableFuture<S7Message> sendInternal(S7Message request) {
}
/**
- * This method is only called when there is no Response Handler.
+ * DECODE:
+ * This method is called when there is no handler for the message.
+ * By default it must correspond to asynchronous events, which if so,
+ * must be transferred to the event queue.
+ *
+ * The event's own information is encapsulated in the parameters and payload
+ * field. From this it is abstracted to the corresponding event model.
+ *
+ * 01. S7ModeEvent:
+ * 02. S7UserEvent:
+ * 03. S7SysEvent:
+ * 04. S7CyclicEvent:
+ *
+ * TODO: Use mspec to generate types that allow better interpretation of
+ * the code using "instanceof".
*/
@Override
protected void decode(ConversationContext<TPKTPacket> context, TPKTPacket msg) throws Exception {
-
- S7Message s7msg = msg.getPayload().getPayload();
- S7Parameter parameter = s7msg.getParameter();
- if (parameter instanceof S7ParameterModeTransition) {
- // TODO: The eventQueue is only drained in the S7ProtocolEventLogic.ObjectProcessor and here only messages of type S7Event are processed, so S7PayloadUserDataItem elements will just be ignored.
- //eventQueue.add(parameter);
+ System.out.println(msg);
Review Comment:
maybe remove that before merge
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: dev-unsubscribe@plc4x.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org