Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Corrects the call to generate events that were commented. Tests again… #1400

Merged
merged 2 commits into from
Feb 14, 2024
Merged

Corrects the call to generate events that were commented. Tests again… #1400

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
593cf24
Corrects the call to generate events that were commented. Tests again…
ceos01 Feb 12, 2024
315ec69
Code cleaning is done.
ceos01 Feb 12, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions plc4j/drivers/s7/src/main/java/org/apache/plc4x/java/s7/readwrite/protocol/S7HMuxImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -127,7 +127,6 @@ public class S7HMuxImpl extends MessageToMessageCodec<ByteBuf, ByteBuf> implemen
*/
@Override
protected void encode(ChannelHandlerContext ctx, ByteBuf outbb, List<Object> list) {
logger.debug("ENCODE: " + outbb.toString());
if ((embed_ctx == null) && (ctx.channel() instanceof EmbeddedChannel)) embed_ctx = ctx;
if ((tcp_channel != null) && (embed_ctx == ctx)) {
tcp_channel.writeAndFlush(outbb.copy());
Expand All @@ -142,7 +141,7 @@ protected void encode(ChannelHandlerContext ctx, ByteBuf outbb, List<Object> lis
* the pipeline of the channel "embeded_channel"
*/
@Override
protected void decode(ChannelHandlerContext ctx, ByteBuf inbb, List<Object> list) throws Exception {
protected void decode(ChannelHandlerContext ctx, ByteBuf inbb, List<Object> list) throws Exception {
embed_ctx.fireChannelRead(inbb.copy());
}

Expand Down
26 changes: 9 additions & 17 deletions ...rs/s7/src/main/java/org/apache/plc4x/java/s7/readwrite/protocol/S7ProtocolEventLogic.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -129,25 +129,17 @@ public void run() {
while (!shutdown) {
try {
S7Event s7Event = eventQueue.poll(DEFAULT_DELAY, TimeUnit.MILLISECONDS);
if (s7Event != null) {
if (s7Event instanceof S7ParameterModeTransition) {
S7ModeEvent modeEvent = new S7ModeEvent((S7ParameterModeTransition) s7Event);
dispatchQueue.add(modeEvent);
} else if (s7Event instanceof S7PayloadDiagnosticMessage) {
S7PayloadDiagnosticMessage msg = (S7PayloadDiagnosticMessage) s7Event;
if ((msg.getEventId() >= 0x0A000) & (msg.getEventId() <= 0x0BFFF)) {
S7UserEvent userEvent = new S7UserEvent(msg);
dispatchQueue.add(userEvent);
} else {
S7SysEvent sysEvent = new S7SysEvent(msg);
dispatchQueue.add(sysEvent);
}
if ((s7Event != null) && (dispatchQueue.remainingCapacity() > 1)) {
if (s7Event instanceof S7ModeEvent) {
dispatchQueue.add(s7Event);
} else if (s7Event instanceof S7UserEvent) {
dispatchQueue.add(s7Event);
} else if (s7Event instanceof S7SysEvent) {
dispatchQueue.add(s7Event);
} else if (s7Event instanceof S7CyclicEvent) {
S7CyclicEvent cyclicEvent = (S7CyclicEvent) s7Event;
dispatchQueue.add(cyclicEvent);
dispatchQueue.add(s7Event);
} else {
S7AlarmEvent alarmEvent = new S7AlarmEvent(s7Event);
dispatchQueue.add(alarmEvent);
dispatchQueue.add(s7Event);
}
}
} catch (InterruptedException ex) {
Expand Down
89 changes: 62 additions & 27 deletions ...drivers/s7/src/main/java/org/apache/plc4x/java/s7/readwrite/protocol/S7ProtocolLogic.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,10 @@
import java.util.function.Consumer;
import java.util.stream.Collectors;
import java.util.stream.IntStream;
import org.apache.plc4x.java.s7.events.S7AlarmEvent;
import org.apache.plc4x.java.s7.events.S7ModeEvent;
import org.apache.plc4x.java.s7.events.S7SysEvent;
import org.apache.plc4x.java.s7.events.S7UserEvent;

/**
* The S7 Protocol states that there can not be more then {min(maxAmqCaller, maxAmqCallee} "ongoing" requests.
Expand Down Expand Up @@ -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);
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

maybe remove that before merge

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) {

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

why are there so many empty lines now?

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) {
glcj marked this conversation as resolved.
Show resolved Hide resolved
//final S7PayloadDiagnosticMessage pload = (S7PayloadDiagnosticMessage) item;
S7AlarmEvent alrmEvent = new S7AlarmEvent(item);
eventQueue.add(alrmEvent);
//}
});


} else if ((myParameter.getCpuFunctionType() == 0x00) && (myParameter.getCpuSubfunction() == 0x13)) {

} else if ((myParameter.getCpuFunctionGroup() == 0x02) && (myParameter.getCpuFunctionType() == 0x00) && (myParameter.getCpuSubfunction() == 0x01)) {
} else if ((myParameter.getCpuFunctionGroup() == 0x02) && (myParameter.getCpuFunctionType() == 0x00) && (myParameter.getCpuSubfunction() == 0x01)) { //(05)

S7ParameterUserDataItemCPUFunctions parameterItem =
(S7ParameterUserDataItemCPUFunctions)
((S7ParameterUserData) parameter).getItems().get(0);

S7PayloadUserData payload = (S7PayloadUserData) s7msg.getPayload();

S7PayloadUserDataItemCyclicServicesPush payloadItem =
(S7PayloadUserDataItemCyclicServicesPush)
payload.getItems().get(0);
Expand All @@ -1505,13 +1541,12 @@ protected void decode(ConversationContext<TPKTPacket> context, TPKTPacket msg) t
payloadItem);
eventQueue.add(cycEvent);

} else if ((myParameter.getCpuFunctionGroup() == 0x02) && (myParameter.getCpuFunctionType() == 0x00) && (myParameter.getCpuSubfunction() == 0x05)) {
} else if ((myParameter.getCpuFunctionGroup() == 0x02) && (myParameter.getCpuFunctionType() == 0x00) && (myParameter.getCpuSubfunction() == 0x05)) { //(06)

S7ParameterUserDataItemCPUFunctions parameterItem =
(S7ParameterUserDataItemCPUFunctions)
((S7ParameterUserData) parameter).getItems().get(0);

S7PayloadUserData payload = (S7PayloadUserData) s7msg.getPayload();

S7PayloadUserDataItemCyclicServicesChangeDrivenPush payloadItem =
(S7PayloadUserDataItemCyclicServicesChangeDrivenPush)
payload.getItems().get(0);
Expand Down
Loading