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/03/31 14:47:53 UTC
[plc4x] branch develop updated (ece4af4 -> 49c9c48)
This is an automated email from the ASF dual-hosted git repository.
cdutz pushed a change to branch develop
in repository https://gitbox.apache.org/repos/asf/plc4x.git.
from ece4af4 fix(plc4j/s7): communication with LOGO 0AB7 and ISOonTCP tsap configuration (#308)
new 29d8011 fix(codegen/plc4c): Fixed a wrong include statement
new afbdbc2 fix(codegen/plc4go): Fixed a problem using unary expressions in plc4go static calls
new 18ea08e fix(protocol/test): Changed the checksum fields to actually call checksum functions
new ebe3bfc fix(codegen/plc4c): Fixed a wrong include statement
new 1cc51e3 fix(codegen/plc4c): Fixed a wrong include statement
new 00a857a fix(plc4j/s7): Fixed some issues in the freshly merged S7 PR
new 551868f fix(plc4j/spi): Made it simpler to detect configuration problems
new bebefb8 chore(plc4j/s7): Cleaned up the code a bit
new 6ab7c40 fix(plc4j/s7): Fixed some issues in the freshly merged S7 PR
new 49c9c48 fix(build): Addressed a CVE in jackson as well as bumped the version of Netty to the latest version
The 10 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../templates/c/complex-type-template.c.ftlh | 1 -
.../language/go/GoLanguageTemplateHelper.java | 3 ++
.../plc4go/test/readwrite/model/StaticHelper.go | 8 ++++
.../java/test/readwrite/utils/StaticHelper.java | 8 ++++
.../src/main/resources/protocols/test/test.mspec | 8 ++--
plc4c/generated-sources/modbus/src/modbus_adu.c | 1 -
.../modbus/src/modbus_constants.c | 1 -
.../modbus/src/modbus_device_information_object.c | 1 -
plc4c/generated-sources/modbus/src/modbus_pdu.c | 1 -
.../src/modbus_pdu_read_file_record_request_item.c | 1 -
.../modbus_pdu_read_file_record_response_item.c | 1 -
.../modbus_pdu_write_file_record_request_item.c | 1 -
.../modbus_pdu_write_file_record_response_item.c | 1 -
.../s7/src/alarm_message_ack_object_push_type.c | 1 -
.../s7/src/alarm_message_ack_push_type.c | 1 -
.../s7/src/alarm_message_ack_response_type.c | 1 -
.../s7/src/alarm_message_ack_type.c | 1 -
.../s7/src/alarm_message_object_ack_type.c | 1 -
.../s7/src/alarm_message_object_push_type.c | 1 -
.../s7/src/alarm_message_object_query_type.c | 1 -
.../s7/src/alarm_message_push_type.c | 1 -
.../s7/src/alarm_message_query_type.c | 1 -
.../s7/src/associated_value_type.c | 1 -
plc4c/generated-sources/s7/src/cotp_packet.c | 1 -
plc4c/generated-sources/s7/src/cotp_parameter.c | 1 -
plc4c/generated-sources/s7/src/date_and_time.c | 1 -
plc4c/generated-sources/s7/src/s7_address.c | 1 -
.../s7/src/s7_data_alarm_message.c | 1 -
plc4c/generated-sources/s7/src/s7_message.c | 1 -
plc4c/generated-sources/s7/src/s7_parameter.c | 1 -
.../s7/src/s7_parameter_user_data_item.c | 1 -
plc4c/generated-sources/s7/src/s7_payload.c | 1 -
.../s7/src/s7_payload_user_data_item.c | 1 -
.../s7/src/s7_var_payload_data_item.c | 1 -
.../s7/src/s7_var_payload_status_item.c | 1 -
.../s7/src/s7_var_request_parameter_item.c | 1 -
plc4c/generated-sources/s7/src/state.c | 1 -
.../generated-sources/s7/src/szl_data_tree_item.c | 1 -
plc4c/generated-sources/s7/src/szl_id.c | 1 -
plc4c/generated-sources/s7/src/tpkt_packet.c | 1 -
.../testing/protocols/s7/DriverTestsuite.xml | 14 +++----
.../readwrite/configuration/S7Configuration.java | 6 +--
.../java/s7/readwrite/context/S7DriverContext.java | 10 +++--
.../s7/readwrite/protocol/S7ProtocolLogic.java | 45 ++++++++--------------
.../spi/configuration/ConfigurationFactory.java | 13 ++++++-
.../java/spi/connection/NettyChannelFactory.java | 6 +--
pom.xml | 6 +--
.../resources/protocols/s7/DriverTestsuite.xml | 14 +++----
48 files changed, 80 insertions(+), 97 deletions(-)
[plc4x] 01/10: fix(codegen/plc4c): Fixed a wrong include statement
Posted by cd...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
cdutz pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/plc4x.git
commit 29d8011486ccca717ac1ff4ace87ff3c8a5e7a0b
Author: cdutz <ch...@c-ware.de>
AuthorDate: Thu Mar 31 16:40:39 2022 +0200
fix(codegen/plc4c): Fixed a wrong include statement
---
.../src/main/resources/templates/c/complex-type-template.c.ftlh | 1 -
1 file changed, 1 deletion(-)
diff --git a/code-generation/language-c/src/main/resources/templates/c/complex-type-template.c.ftlh b/code-generation/language-c/src/main/resources/templates/c/complex-type-template.c.ftlh
index f0c009a..184c4b7 100644
--- a/code-generation/language-c/src/main/resources/templates/c/complex-type-template.c.ftlh
+++ b/code-generation/language-c/src/main/resources/templates/c/complex-type-template.c.ftlh
@@ -47,7 +47,6 @@
#include <stdio.h>
#include <plc4c/spi/evaluation_helper.h>
-#include <plc4c/driver_${helper.camelCaseToSnakeCase(protocolName)}_static_helper.h>
#include "${helper.camelCaseToSnakeCase(type.name)}.h"
// Code generated by code-generation. DO NOT EDIT.
[plc4x] 03/10: fix(protocol/test): Changed the checksum fields to actually call checksum functions
Posted by cd...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
cdutz pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/plc4x.git
commit 18ea08e06b3ca70d00dc210b6017d2a27af9ae57
Author: cdutz <ch...@c-ware.de>
AuthorDate: Thu Mar 31 16:42:47 2022 +0200
fix(protocol/test): Changed the checksum fields to actually call checksum functions
---
.../plc4go/internal/plc4go/test/readwrite/model/StaticHelper.go | 8 ++++++++
.../protocol-test/src/main/resources/protocols/test/test.mspec | 8 ++++----
2 files changed, 12 insertions(+), 4 deletions(-)
diff --git a/code-generation/language-go/src/test/resources/plc4go/internal/plc4go/test/readwrite/model/StaticHelper.go b/code-generation/language-go/src/test/resources/plc4go/internal/plc4go/test/readwrite/model/StaticHelper.go
index 10e695c..def83ca 100644
--- a/code-generation/language-go/src/test/resources/plc4go/internal/plc4go/test/readwrite/model/StaticHelper.go
+++ b/code-generation/language-go/src/test/resources/plc4go/internal/plc4go/test/readwrite/model/StaticHelper.go
@@ -80,3 +80,11 @@ func Serialize(io utils.WriteBuffer, data byte) {
func ReadManualField(io utils.ReadBuffer, simpleField uint8) (uint8, error) {
return 0, nil
}
+
+func CrcInt8(num int) (int8, error) {
+ return int8(num), nil
+}
+
+func CrcUint8(num int) (uint8, error) {
+ return uint8(num), nil
+}
diff --git a/code-generation/protocol-test/src/main/resources/protocols/test/test.mspec b/code-generation/protocol-test/src/main/resources/protocols/test/test.mspec
index 1f2c2c4..2636ed4 100644
--- a/code-generation/protocol-test/src/main/resources/protocols/test/test.mspec
+++ b/code-generation/protocol-test/src/main/resources/protocols/test/test.mspec
@@ -38,7 +38,7 @@
[array uint 8 arrayFieldLength length '5' ]
[array uint 8 arrayFieldTerminated terminated 'true']
[assert uint 8 assertField '42' ]
- [checksum uint 8 checksumField '100' ]
+ [checksum uint 8 checksumField 'STATIC_CALL("crcUint8" , -23)']
[const uint 8 constField 5 ]
// Discriminated Field can't be used in simple type
//[discriminator uint 8 discriminatorField]
@@ -68,7 +68,7 @@
//Abstract fields can only be used within discriminated base types.
//[abstract unit 8 abstractField]
[array uint 8 arrayField count '5']
- [checksum uint 8 checksumField '100']
+ [checksum uint 8 checksumField 'STATIC_CALL("crcUint8" , -23)']
[const uint 8 constField 5]
// Discriminated Field can't be used in simple type
//[discriminator uint 8 discriminatorField]
@@ -146,8 +146,8 @@
[type CheckSumTypeTest
//Bit field cannot be used for a checksum: [checksum bit bitField 'true']
- [checksum int 8 intField '100']
- [checksum uint 8 uintField '100']
+ [checksum int 8 intField 'STATIC_CALL("crcInt8" , -23)']
+ [checksum uint 8 uintField 'STATIC_CALL("crcUint8", 42)']
// Float fields cannot be used as checksums: [checksum float 32 floatField '100.0']
// Float fields cannot be used as checksums: [checksum float 64 doubleField '100.0']
// String field cannot be used as a checksum: [checksum vstring '11 * 8' stringField '"HELLO TODDY"']
[plc4x] 08/10: chore(plc4j/s7): Cleaned up the code a bit
Posted by cd...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
cdutz pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/plc4x.git
commit bebefb87df8df5d5654e3432b2c86a690139e3ce
Author: cdutz <ch...@c-ware.de>
AuthorDate: Thu Mar 31 16:46:54 2022 +0200
chore(plc4j/s7): Cleaned up the code a bit
---
.../s7/readwrite/protocol/S7ProtocolLogic.java | 45 ++++++++--------------
1 file changed, 17 insertions(+), 28 deletions(-)
diff --git a/plc4j/drivers/s7/src/main/java/org/apache/plc4x/java/s7/readwrite/protocol/S7ProtocolLogic.java b/plc4j/drivers/s7/src/main/java/org/apache/plc4x/java/s7/readwrite/protocol/S7ProtocolLogic.java
index 0ab2ced..5f874e2 100644
--- a/plc4j/drivers/s7/src/main/java/org/apache/plc4x/java/s7/readwrite/protocol/S7ProtocolLogic.java
+++ b/plc4j/drivers/s7/src/main/java/org/apache/plc4x/java/s7/readwrite/protocol/S7ProtocolLogic.java
@@ -94,8 +94,8 @@ public class S7ProtocolLogic extends Plc4xProtocolBase<TPKTPacket> {
* (Examples of this are PCS7 and Braumat).
* Alarm filtering, ack, etc. must be performed by the client application.
*/
- private final BlockingQueue eventqueue = new ArrayBlockingQueue<>(1024);
- private final S7ProtocolEventLogic EventLogic = new S7ProtocolEventLogic(eventqueue);
+ private final BlockingQueue<Message> eventQueue = new ArrayBlockingQueue<>(1024);
+ private final S7ProtocolEventLogic EventLogic = new S7ProtocolEventLogic(eventQueue);
private final S7PlcSubscriptionHandle modeHandle = new S7PlcSubscriptionHandle(EventType.MODE, EventLogic);
private final S7PlcSubscriptionHandle sysHandle = new S7PlcSubscriptionHandle(EventType.SYS, EventLogic);
private final S7PlcSubscriptionHandle usrHandle = new S7PlcSubscriptionHandle(EventType.USR, EventLogic);
@@ -334,33 +334,25 @@ public class S7ProtocolLogic extends Plc4xProtocolBase<TPKTPacket> {
switch (field.getFieldType()) {
case EVENT_SUBSCRIPTION:
- ;
- encodeEventSubcriptionRequest(request, parameterItems, payloadItems);
+ encodeEventSubscriptionRequest(request, parameterItems, payloadItems);
break;
case EVENT_UNSUBSCRIPTION:
- ;
- //encodeEventUnSubcriptionRequest(msg, out);
+ //encodeEventUnSubscriptionRequest(msg, out);
break;
case ALARM_ACK:
- ;
//encodeAlarmAckRequest(msg, out);
break;
case ALARM_QUERY:
- ;
//encodeAlarmQueryRequest(msg, out);
break;
case CYCLIC_SUBSCRIPTION:
- ;
//encodeCycledSubscriptionRequest(msg, out);
break;
case CYCLIC_UNSUBSCRIPTION:
- ;
//encodeCycledUnSubscriptionRequest(msg, out);
break;
default:
- ;
}
- ;
//final PlcValue plcValue = request.getPlcValue(fieldName);
//parameterItems.add(new S7VarRequestParameterItemAddress(encodeS7Address(field)));
//payloadItems.add(serializePlcValue(field, plcValue));
@@ -389,7 +381,7 @@ public class S7ProtocolLogic extends Plc4xProtocolBase<TPKTPacket> {
.check(p -> p.getTpduReference() == tpduId)
.handle(p -> {
try {
- future.complete(((PlcSubscriptionResponse) decodeEventSubcriptionRequest(p, subscriptionRequest)));
+ future.complete(decodeEventSubscriptionRequest(p, subscriptionRequest));
} catch (PlcProtocolException e) {
logger.warn("Error sending 'write' message: '{}'", e.getMessage(), e);
}
@@ -408,7 +400,7 @@ public class S7ProtocolLogic extends Plc4xProtocolBase<TPKTPacket> {
return future;
}
- private void encodeEventSubcriptionRequest(DefaultPlcSubscriptionRequest request,
+ private void encodeEventSubscriptionRequest(DefaultPlcSubscriptionRequest request,
List<S7ParameterUserDataItem> parameterItems,
List<S7PayloadUserDataItem> payloadItems) {
byte subsevent = 0;
@@ -436,7 +428,7 @@ public class S7ProtocolLogic extends Plc4xProtocolBase<TPKTPacket> {
parameterItems.add(parameter);
- S7PayloadUserDataItemCpuFunctionMsgSubscription payload = null;
+ S7PayloadUserDataItemCpuFunctionMsgSubscription payload;
if (subsevent > 0) {
payload = new S7PayloadUserDataItemCpuFunctionMsgSubscription(
@@ -467,7 +459,7 @@ public class S7ProtocolLogic extends Plc4xProtocolBase<TPKTPacket> {
}
- private PlcSubscriptionResponse decodeEventSubcriptionRequest(S7Message responseMessage,
+ private PlcSubscriptionResponse decodeEventSubscriptionRequest(S7Message responseMessage,
PlcSubscriptionRequest plcSubscriptionRequest)
throws PlcProtocolException {
Map<String, ResponseItem<PlcSubscriptionHandle>> values = new HashMap<>();
@@ -476,7 +468,7 @@ public class S7ProtocolLogic extends Plc4xProtocolBase<TPKTPacket> {
if (responseMessage instanceof S7MessageUserData) {
S7MessageUserData messageUserData = (S7MessageUserData) responseMessage;
S7PayloadUserData payload = (S7PayloadUserData) messageUserData.getPayload();
- //errorClass = payload.getItems()[0].
+ // errorClass = payload.getItems()[0].
// errorCode = messageUserData.getParameter().
} else if (responseMessage instanceof S7MessageResponse) {
@@ -570,9 +562,9 @@ public class S7ProtocolLogic extends Plc4xProtocolBase<TPKTPacket> {
return null;
}
- private void encodeEventUnSubcriptionRequest(DefaultPlcSubscriptionRequest request,
- List<S7VarRequestParameterItem> parameterItems,
- List<S7VarPayloadDataItem> payloadItems) {
+ private void encodeEventUnSubscriptionRequest(DefaultPlcSubscriptionRequest request,
+ List<S7VarRequestParameterItem> parameterItems,
+ List<S7VarPayloadDataItem> payloadItems) {
}
@@ -605,11 +597,10 @@ public class S7ProtocolLogic extends Plc4xProtocolBase<TPKTPacket> {
*/
@Override
protected void decode(ConversationContext<TPKTPacket> context, TPKTPacket msg) throws Exception {
- //System.out.println(msg);
S7Message s7msg = msg.getPayload().getPayload();
S7Parameter parameter = s7msg.getParameter();
if (parameter instanceof S7ParameterModeTransition) {
- eventqueue.add(parameter);
+ eventQueue.add(parameter);
} else if (parameter instanceof S7ParameterUserData) {
S7ParameterUserData parameterud = (S7ParameterUserData) parameter;
List<S7ParameterUserDataItem> parameterudis = parameterud.getItems();
@@ -622,7 +613,7 @@ public class S7ProtocolLogic extends Plc4xProtocolBase<TPKTPacket> {
List<S7PayloadUserDataItem> items = payload.getItems();
for (S7PayloadUserDataItem item : items) {
if (item instanceof S7PayloadDiagnosticMessage) {
- eventqueue.add(item);
+ eventQueue.add(item);
}
}
} else if ((myparameter.getCpuFunctionType() == 0x00) &&
@@ -635,9 +626,7 @@ public class S7ProtocolLogic extends Plc4xProtocolBase<TPKTPacket> {
(myparameter.getCpuSubfunction() == 0x16))) {
S7PayloadUserData payload = (S7PayloadUserData) s7msg.getPayload();
List<S7PayloadUserDataItem> items = payload.getItems();
- for (Object item : items) {
- eventqueue.add(item);
- }
+ eventQueue.addAll(items);
} else if ((myparameter.getCpuFunctionType() == 0x00) && (myparameter.getCpuSubfunction() == 0x13)) {
}
@@ -868,9 +857,9 @@ public class S7ProtocolLogic extends Plc4xProtocolBase<TPKTPacket> {
DataItem.staticSerialize(writeBuffer, plcValue.getIndex(i), field.getDataType().getDataProtocolId(), stringLength);
// Allocate enough space for all items.
if (byteBuffer == null) {
- byteBuffer = ByteBuffer.allocate(writeBuffer.getData().length * field.getNumberOfElements());
+ byteBuffer = ByteBuffer.allocate(writeBuffer.getBytes().length * field.getNumberOfElements());
}
- byteBuffer.put(writeBuffer.getData());
+ byteBuffer.put(writeBuffer.getBytes());
}
if (byteBuffer != null) {
byte[] data = byteBuffer.array();
[plc4x] 05/10: fix(codegen/plc4c): Fixed a wrong include statement
Posted by cd...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
cdutz pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/plc4x.git
commit 1cc51e333ca79324291187e901ff16dc85957298
Author: cdutz <ch...@c-ware.de>
AuthorDate: Thu Mar 31 16:43:31 2022 +0200
fix(codegen/plc4c): Fixed a wrong include statement
---
plc4c/generated-sources/s7/src/alarm_message_ack_object_push_type.c | 1 -
plc4c/generated-sources/s7/src/alarm_message_ack_push_type.c | 1 -
plc4c/generated-sources/s7/src/alarm_message_ack_response_type.c | 1 -
plc4c/generated-sources/s7/src/alarm_message_ack_type.c | 1 -
plc4c/generated-sources/s7/src/alarm_message_object_ack_type.c | 1 -
plc4c/generated-sources/s7/src/alarm_message_object_push_type.c | 1 -
plc4c/generated-sources/s7/src/alarm_message_object_query_type.c | 1 -
plc4c/generated-sources/s7/src/alarm_message_push_type.c | 1 -
plc4c/generated-sources/s7/src/alarm_message_query_type.c | 1 -
plc4c/generated-sources/s7/src/associated_value_type.c | 1 -
plc4c/generated-sources/s7/src/cotp_packet.c | 1 -
plc4c/generated-sources/s7/src/cotp_parameter.c | 1 -
plc4c/generated-sources/s7/src/date_and_time.c | 1 -
plc4c/generated-sources/s7/src/s7_address.c | 1 -
plc4c/generated-sources/s7/src/s7_data_alarm_message.c | 1 -
plc4c/generated-sources/s7/src/s7_message.c | 1 -
plc4c/generated-sources/s7/src/s7_parameter.c | 1 -
plc4c/generated-sources/s7/src/s7_parameter_user_data_item.c | 1 -
plc4c/generated-sources/s7/src/s7_payload.c | 1 -
plc4c/generated-sources/s7/src/s7_payload_user_data_item.c | 1 -
plc4c/generated-sources/s7/src/s7_var_payload_data_item.c | 1 -
plc4c/generated-sources/s7/src/s7_var_payload_status_item.c | 1 -
plc4c/generated-sources/s7/src/s7_var_request_parameter_item.c | 1 -
plc4c/generated-sources/s7/src/state.c | 1 -
plc4c/generated-sources/s7/src/szl_data_tree_item.c | 1 -
plc4c/generated-sources/s7/src/szl_id.c | 1 -
plc4c/generated-sources/s7/src/tpkt_packet.c | 1 -
27 files changed, 27 deletions(-)
diff --git a/plc4c/generated-sources/s7/src/alarm_message_ack_object_push_type.c b/plc4c/generated-sources/s7/src/alarm_message_ack_object_push_type.c
index 6ebf8cc..ba2fa96 100644
--- a/plc4c/generated-sources/s7/src/alarm_message_ack_object_push_type.c
+++ b/plc4c/generated-sources/s7/src/alarm_message_ack_object_push_type.c
@@ -19,7 +19,6 @@
#include <stdio.h>
#include <plc4c/spi/evaluation_helper.h>
-#include <plc4c/driver_s7_static_helper.h>
#include "alarm_message_ack_object_push_type.h"
// Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4c/generated-sources/s7/src/alarm_message_ack_push_type.c b/plc4c/generated-sources/s7/src/alarm_message_ack_push_type.c
index 4096a5e..9ec8ccc 100644
--- a/plc4c/generated-sources/s7/src/alarm_message_ack_push_type.c
+++ b/plc4c/generated-sources/s7/src/alarm_message_ack_push_type.c
@@ -19,7 +19,6 @@
#include <stdio.h>
#include <plc4c/spi/evaluation_helper.h>
-#include <plc4c/driver_s7_static_helper.h>
#include "alarm_message_ack_push_type.h"
// Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4c/generated-sources/s7/src/alarm_message_ack_response_type.c b/plc4c/generated-sources/s7/src/alarm_message_ack_response_type.c
index 41ea1f3..81c2d9e 100644
--- a/plc4c/generated-sources/s7/src/alarm_message_ack_response_type.c
+++ b/plc4c/generated-sources/s7/src/alarm_message_ack_response_type.c
@@ -19,7 +19,6 @@
#include <stdio.h>
#include <plc4c/spi/evaluation_helper.h>
-#include <plc4c/driver_s7_static_helper.h>
#include "alarm_message_ack_response_type.h"
// Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4c/generated-sources/s7/src/alarm_message_ack_type.c b/plc4c/generated-sources/s7/src/alarm_message_ack_type.c
index 8c7603b..5b4ba06 100644
--- a/plc4c/generated-sources/s7/src/alarm_message_ack_type.c
+++ b/plc4c/generated-sources/s7/src/alarm_message_ack_type.c
@@ -19,7 +19,6 @@
#include <stdio.h>
#include <plc4c/spi/evaluation_helper.h>
-#include <plc4c/driver_s7_static_helper.h>
#include "alarm_message_ack_type.h"
// Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4c/generated-sources/s7/src/alarm_message_object_ack_type.c b/plc4c/generated-sources/s7/src/alarm_message_object_ack_type.c
index 009f051..b375594 100644
--- a/plc4c/generated-sources/s7/src/alarm_message_object_ack_type.c
+++ b/plc4c/generated-sources/s7/src/alarm_message_object_ack_type.c
@@ -19,7 +19,6 @@
#include <stdio.h>
#include <plc4c/spi/evaluation_helper.h>
-#include <plc4c/driver_s7_static_helper.h>
#include "alarm_message_object_ack_type.h"
// Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4c/generated-sources/s7/src/alarm_message_object_push_type.c b/plc4c/generated-sources/s7/src/alarm_message_object_push_type.c
index 5cc4cb4..31b4045 100644
--- a/plc4c/generated-sources/s7/src/alarm_message_object_push_type.c
+++ b/plc4c/generated-sources/s7/src/alarm_message_object_push_type.c
@@ -19,7 +19,6 @@
#include <stdio.h>
#include <plc4c/spi/evaluation_helper.h>
-#include <plc4c/driver_s7_static_helper.h>
#include "alarm_message_object_push_type.h"
// Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4c/generated-sources/s7/src/alarm_message_object_query_type.c b/plc4c/generated-sources/s7/src/alarm_message_object_query_type.c
index 4febb6e..f2f2e80 100644
--- a/plc4c/generated-sources/s7/src/alarm_message_object_query_type.c
+++ b/plc4c/generated-sources/s7/src/alarm_message_object_query_type.c
@@ -19,7 +19,6 @@
#include <stdio.h>
#include <plc4c/spi/evaluation_helper.h>
-#include <plc4c/driver_s7_static_helper.h>
#include "alarm_message_object_query_type.h"
// Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4c/generated-sources/s7/src/alarm_message_push_type.c b/plc4c/generated-sources/s7/src/alarm_message_push_type.c
index 3bc6f75..cc8d6de 100644
--- a/plc4c/generated-sources/s7/src/alarm_message_push_type.c
+++ b/plc4c/generated-sources/s7/src/alarm_message_push_type.c
@@ -19,7 +19,6 @@
#include <stdio.h>
#include <plc4c/spi/evaluation_helper.h>
-#include <plc4c/driver_s7_static_helper.h>
#include "alarm_message_push_type.h"
// Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4c/generated-sources/s7/src/alarm_message_query_type.c b/plc4c/generated-sources/s7/src/alarm_message_query_type.c
index 34e186a..0add81f 100644
--- a/plc4c/generated-sources/s7/src/alarm_message_query_type.c
+++ b/plc4c/generated-sources/s7/src/alarm_message_query_type.c
@@ -19,7 +19,6 @@
#include <stdio.h>
#include <plc4c/spi/evaluation_helper.h>
-#include <plc4c/driver_s7_static_helper.h>
#include "alarm_message_query_type.h"
// Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4c/generated-sources/s7/src/associated_value_type.c b/plc4c/generated-sources/s7/src/associated_value_type.c
index ab7a32d..899327e 100644
--- a/plc4c/generated-sources/s7/src/associated_value_type.c
+++ b/plc4c/generated-sources/s7/src/associated_value_type.c
@@ -19,7 +19,6 @@
#include <stdio.h>
#include <plc4c/spi/evaluation_helper.h>
-#include <plc4c/driver_s7_static_helper.h>
#include "associated_value_type.h"
// Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4c/generated-sources/s7/src/cotp_packet.c b/plc4c/generated-sources/s7/src/cotp_packet.c
index ffd32a4..a42a97f 100644
--- a/plc4c/generated-sources/s7/src/cotp_packet.c
+++ b/plc4c/generated-sources/s7/src/cotp_packet.c
@@ -19,7 +19,6 @@
#include <stdio.h>
#include <plc4c/spi/evaluation_helper.h>
-#include <plc4c/driver_s7_static_helper.h>
#include "cotp_packet.h"
// Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4c/generated-sources/s7/src/cotp_parameter.c b/plc4c/generated-sources/s7/src/cotp_parameter.c
index 0838104..447258c 100644
--- a/plc4c/generated-sources/s7/src/cotp_parameter.c
+++ b/plc4c/generated-sources/s7/src/cotp_parameter.c
@@ -19,7 +19,6 @@
#include <stdio.h>
#include <plc4c/spi/evaluation_helper.h>
-#include <plc4c/driver_s7_static_helper.h>
#include "cotp_parameter.h"
// Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4c/generated-sources/s7/src/date_and_time.c b/plc4c/generated-sources/s7/src/date_and_time.c
index f1ff885..ef686f1 100644
--- a/plc4c/generated-sources/s7/src/date_and_time.c
+++ b/plc4c/generated-sources/s7/src/date_and_time.c
@@ -19,7 +19,6 @@
#include <stdio.h>
#include <plc4c/spi/evaluation_helper.h>
-#include <plc4c/driver_s7_static_helper.h>
#include "date_and_time.h"
// Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4c/generated-sources/s7/src/s7_address.c b/plc4c/generated-sources/s7/src/s7_address.c
index dd7e7b1..b4c0c36 100644
--- a/plc4c/generated-sources/s7/src/s7_address.c
+++ b/plc4c/generated-sources/s7/src/s7_address.c
@@ -19,7 +19,6 @@
#include <stdio.h>
#include <plc4c/spi/evaluation_helper.h>
-#include <plc4c/driver_s7_static_helper.h>
#include "s7_address.h"
// Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4c/generated-sources/s7/src/s7_data_alarm_message.c b/plc4c/generated-sources/s7/src/s7_data_alarm_message.c
index 33080d9..ecacdfa 100644
--- a/plc4c/generated-sources/s7/src/s7_data_alarm_message.c
+++ b/plc4c/generated-sources/s7/src/s7_data_alarm_message.c
@@ -19,7 +19,6 @@
#include <stdio.h>
#include <plc4c/spi/evaluation_helper.h>
-#include <plc4c/driver_s7_static_helper.h>
#include "s7_data_alarm_message.h"
// Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4c/generated-sources/s7/src/s7_message.c b/plc4c/generated-sources/s7/src/s7_message.c
index 52eb6ab..8fa06bf 100644
--- a/plc4c/generated-sources/s7/src/s7_message.c
+++ b/plc4c/generated-sources/s7/src/s7_message.c
@@ -19,7 +19,6 @@
#include <stdio.h>
#include <plc4c/spi/evaluation_helper.h>
-#include <plc4c/driver_s7_static_helper.h>
#include "s7_message.h"
// Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4c/generated-sources/s7/src/s7_parameter.c b/plc4c/generated-sources/s7/src/s7_parameter.c
index 65805ba..fb07697 100644
--- a/plc4c/generated-sources/s7/src/s7_parameter.c
+++ b/plc4c/generated-sources/s7/src/s7_parameter.c
@@ -19,7 +19,6 @@
#include <stdio.h>
#include <plc4c/spi/evaluation_helper.h>
-#include <plc4c/driver_s7_static_helper.h>
#include "s7_parameter.h"
// Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4c/generated-sources/s7/src/s7_parameter_user_data_item.c b/plc4c/generated-sources/s7/src/s7_parameter_user_data_item.c
index 0025656..594a9bd 100644
--- a/plc4c/generated-sources/s7/src/s7_parameter_user_data_item.c
+++ b/plc4c/generated-sources/s7/src/s7_parameter_user_data_item.c
@@ -19,7 +19,6 @@
#include <stdio.h>
#include <plc4c/spi/evaluation_helper.h>
-#include <plc4c/driver_s7_static_helper.h>
#include "s7_parameter_user_data_item.h"
// Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4c/generated-sources/s7/src/s7_payload.c b/plc4c/generated-sources/s7/src/s7_payload.c
index 7178a2d..e5f6b4b 100644
--- a/plc4c/generated-sources/s7/src/s7_payload.c
+++ b/plc4c/generated-sources/s7/src/s7_payload.c
@@ -19,7 +19,6 @@
#include <stdio.h>
#include <plc4c/spi/evaluation_helper.h>
-#include <plc4c/driver_s7_static_helper.h>
#include "s7_payload.h"
// Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4c/generated-sources/s7/src/s7_payload_user_data_item.c b/plc4c/generated-sources/s7/src/s7_payload_user_data_item.c
index f942afd..6620ee8 100644
--- a/plc4c/generated-sources/s7/src/s7_payload_user_data_item.c
+++ b/plc4c/generated-sources/s7/src/s7_payload_user_data_item.c
@@ -19,7 +19,6 @@
#include <stdio.h>
#include <plc4c/spi/evaluation_helper.h>
-#include <plc4c/driver_s7_static_helper.h>
#include "s7_payload_user_data_item.h"
// Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4c/generated-sources/s7/src/s7_var_payload_data_item.c b/plc4c/generated-sources/s7/src/s7_var_payload_data_item.c
index c23ff8d..7b175ba 100644
--- a/plc4c/generated-sources/s7/src/s7_var_payload_data_item.c
+++ b/plc4c/generated-sources/s7/src/s7_var_payload_data_item.c
@@ -19,7 +19,6 @@
#include <stdio.h>
#include <plc4c/spi/evaluation_helper.h>
-#include <plc4c/driver_s7_static_helper.h>
#include "s7_var_payload_data_item.h"
// Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4c/generated-sources/s7/src/s7_var_payload_status_item.c b/plc4c/generated-sources/s7/src/s7_var_payload_status_item.c
index 550a709..81b4c68 100644
--- a/plc4c/generated-sources/s7/src/s7_var_payload_status_item.c
+++ b/plc4c/generated-sources/s7/src/s7_var_payload_status_item.c
@@ -19,7 +19,6 @@
#include <stdio.h>
#include <plc4c/spi/evaluation_helper.h>
-#include <plc4c/driver_s7_static_helper.h>
#include "s7_var_payload_status_item.h"
// Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4c/generated-sources/s7/src/s7_var_request_parameter_item.c b/plc4c/generated-sources/s7/src/s7_var_request_parameter_item.c
index 18e6c77..25a72aa 100644
--- a/plc4c/generated-sources/s7/src/s7_var_request_parameter_item.c
+++ b/plc4c/generated-sources/s7/src/s7_var_request_parameter_item.c
@@ -19,7 +19,6 @@
#include <stdio.h>
#include <plc4c/spi/evaluation_helper.h>
-#include <plc4c/driver_s7_static_helper.h>
#include "s7_var_request_parameter_item.h"
// Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4c/generated-sources/s7/src/state.c b/plc4c/generated-sources/s7/src/state.c
index 745ba62..c91a467 100644
--- a/plc4c/generated-sources/s7/src/state.c
+++ b/plc4c/generated-sources/s7/src/state.c
@@ -19,7 +19,6 @@
#include <stdio.h>
#include <plc4c/spi/evaluation_helper.h>
-#include <plc4c/driver_s7_static_helper.h>
#include "state.h"
// Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4c/generated-sources/s7/src/szl_data_tree_item.c b/plc4c/generated-sources/s7/src/szl_data_tree_item.c
index 7a2e19b..fbbb29c 100644
--- a/plc4c/generated-sources/s7/src/szl_data_tree_item.c
+++ b/plc4c/generated-sources/s7/src/szl_data_tree_item.c
@@ -19,7 +19,6 @@
#include <stdio.h>
#include <plc4c/spi/evaluation_helper.h>
-#include <plc4c/driver_s7_static_helper.h>
#include "szl_data_tree_item.h"
// Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4c/generated-sources/s7/src/szl_id.c b/plc4c/generated-sources/s7/src/szl_id.c
index 6cd2281..e37a996 100644
--- a/plc4c/generated-sources/s7/src/szl_id.c
+++ b/plc4c/generated-sources/s7/src/szl_id.c
@@ -19,7 +19,6 @@
#include <stdio.h>
#include <plc4c/spi/evaluation_helper.h>
-#include <plc4c/driver_s7_static_helper.h>
#include "szl_id.h"
// Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4c/generated-sources/s7/src/tpkt_packet.c b/plc4c/generated-sources/s7/src/tpkt_packet.c
index 05811ca..1791493 100644
--- a/plc4c/generated-sources/s7/src/tpkt_packet.c
+++ b/plc4c/generated-sources/s7/src/tpkt_packet.c
@@ -19,7 +19,6 @@
#include <stdio.h>
#include <plc4c/spi/evaluation_helper.h>
-#include <plc4c/driver_s7_static_helper.h>
#include "tpkt_packet.h"
// Code generated by code-generation. DO NOT EDIT.
[plc4x] 07/10: fix(plc4j/spi): Made it simpler to detect configuration problems
Posted by cd...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
cdutz pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/plc4x.git
commit 551868fab9dbe6577414e2a21c74019ae88868cf
Author: cdutz <ch...@c-ware.de>
AuthorDate: Thu Mar 31 16:46:03 2022 +0200
fix(plc4j/spi): Made it simpler to detect configuration problems
---
.../plc4x/java/spi/configuration/ConfigurationFactory.java | 13 +++++++++++--
.../plc4x/java/spi/connection/NettyChannelFactory.java | 6 +++---
2 files changed, 14 insertions(+), 5 deletions(-)
diff --git a/plc4j/spi/src/main/java/org/apache/plc4x/java/spi/configuration/ConfigurationFactory.java b/plc4j/spi/src/main/java/org/apache/plc4x/java/spi/configuration/ConfigurationFactory.java
index 4bd2456..728f0f9 100644
--- a/plc4j/spi/src/main/java/org/apache/plc4x/java/spi/configuration/ConfigurationFactory.java
+++ b/plc4j/spi/src/main/java/org/apache/plc4x/java/spi/configuration/ConfigurationFactory.java
@@ -21,8 +21,11 @@ package org.apache.plc4x.java.spi.configuration;
import org.apache.commons.lang3.ClassUtils;
import org.apache.commons.lang3.StringUtils;
import org.apache.commons.lang3.reflect.FieldUtils;
+import org.apache.plc4x.java.api.exceptions.PlcRuntimeException;
import org.apache.plc4x.java.spi.configuration.annotations.*;
import org.apache.plc4x.java.spi.configuration.annotations.defaults.*;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import java.io.UnsupportedEncodingException;
import java.lang.reflect.Field;
@@ -30,7 +33,6 @@ import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.ParameterizedType;
import java.lang.reflect.Type;
import java.net.URLDecoder;
-import java.nio.charset.StandardCharsets;
import java.util.*;
import java.util.function.Function;
import java.util.stream.Collectors;
@@ -47,6 +49,8 @@ import static java.util.stream.Collectors.toList;
*/
public class ConfigurationFactory {
+ private static final Logger LOGGER = LoggerFactory.getLogger(ConfigurationFactory.class);
+
// TODO Respect Path Params
public <T extends Configuration> T createConfiguration(Class<T> pClazz, String configurationString) {
// Get a map of all configuration parameter fields.
@@ -130,7 +134,12 @@ public class ConfigurationFactory {
if (configType instanceof Class) {
Class<?> configClass = (Class<?>) configType;
if (configClass.isAssignableFrom(configuration.getClass())) {
- ((HasConfiguration) obj).setConfiguration(configuration);
+ try {
+ ((HasConfiguration) obj).setConfiguration(configuration);
+ } catch(Throwable t) {
+ LOGGER.error("Error setting the configuration", t);
+ throw new PlcRuntimeException("Error setting the configuration", t);
+ }
}
}
}
diff --git a/plc4j/spi/src/main/java/org/apache/plc4x/java/spi/connection/NettyChannelFactory.java b/plc4j/spi/src/main/java/org/apache/plc4x/java/spi/connection/NettyChannelFactory.java
index caedca7..cd41459 100644
--- a/plc4j/spi/src/main/java/org/apache/plc4x/java/spi/connection/NettyChannelFactory.java
+++ b/plc4j/spi/src/main/java/org/apache/plc4x/java/spi/connection/NettyChannelFactory.java
@@ -118,7 +118,7 @@ public abstract class NettyChannelFactory implements ChannelFactory {
final Channel channel = f.channel();
- // Add to Event Loop Group
+ // Add to event-loop group
if (workerGroup != null) {
eventLoops.put(channel, workerGroup);
}
@@ -137,8 +137,8 @@ public abstract class NettyChannelFactory implements ChannelFactory {
} catch (InterruptedException e) {
Thread.currentThread().interrupt();
throw new PlcConnectionException("Error creating channel.", e);
- } catch (Exception e) {
- throw new PlcConnectionException("Error creating channel.", e);
+ } catch (Throwable t) {
+ throw new PlcConnectionException("Error creating channel.", t);
}
}
[plc4x] 09/10: fix(plc4j/s7): Fixed some issues in the freshly merged S7 PR
Posted by cd...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
cdutz pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/plc4x.git
commit 6ab7c401d3d539fcad8b93754781c2e6a14e87a1
Author: cdutz <ch...@c-ware.de>
AuthorDate: Thu Mar 31 16:47:10 2022 +0200
fix(plc4j/s7): Fixed some issues in the freshly merged S7 PR
---
.../s7/src/test/resources/protocols/s7/DriverTestsuite.xml | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
diff --git a/protocols/s7/src/test/resources/protocols/s7/DriverTestsuite.xml b/protocols/s7/src/test/resources/protocols/s7/DriverTestsuite.xml
index 04bf261..3c1173f 100644
--- a/protocols/s7/src/test/resources/protocols/s7/DriverTestsuite.xml
+++ b/protocols/s7/src/test/resources/protocols/s7/DriverTestsuite.xml
@@ -47,13 +47,6 @@
</COTPPacketConnectionRequest>
<parameters isList="true">
<COTPParameter>
- <parameterType dataType="uint" bitLength="8">194</parameterType>
- <parameterLength dataType="uint" bitLength="8">2</parameterLength>
- <COTPParameterCalledTsap>
- <tsapId dataType="uint" bitLength="16">256</tsapId>
- </COTPParameterCalledTsap>
- </COTPParameter>
- <COTPParameter>
<parameterType dataType="uint" bitLength="8">193</parameterType>
<parameterLength dataType="uint" bitLength="8">2</parameterLength>
<COTPParameterCallingTsap>
@@ -61,6 +54,13 @@
</COTPParameterCallingTsap>
</COTPParameter>
<COTPParameter>
+ <parameterType dataType="uint" bitLength="8">194</parameterType>
+ <parameterLength dataType="uint" bitLength="8">2</parameterLength>
+ <COTPParameterCalledTsap>
+ <tsapId dataType="uint" bitLength="16">256</tsapId>
+ </COTPParameterCalledTsap>
+ </COTPParameter>
+ <COTPParameter>
<parameterType dataType="uint" bitLength="8">192</parameterType>
<parameterLength dataType="uint" bitLength="8">1</parameterLength>
<COTPParameterTpduSize>
[plc4x] 10/10: fix(build): Addressed a CVE in jackson as well as bumped the version of Netty to the latest version
Posted by cd...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
cdutz pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/plc4x.git
commit 49c9c48662ed66f322835194f645af6a6b9f1bee
Author: cdutz <ch...@c-ware.de>
AuthorDate: Thu Mar 31 16:47:45 2022 +0200
fix(build): Addressed a CVE in jackson as well as bumped the version of Netty to the latest version
---
pom.xml | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/pom.xml b/pom.xml
index 04e7b81..c02a11a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -139,7 +139,7 @@
<hamcrest.version>2.2</hamcrest.version>
<httpclient.version>4.5.13</httpclient.version>
<httpcore.version>4.4.15</httpcore.version>
- <jackson.version>2.13.1</jackson.version>
+ <jackson.version>2.13.2</jackson.version>
<woodstox-core.version>6.2.8</woodstox-core.version>
<!-- When updating this to the latest version, we're getting errors in the opcua server tests -->
<jaxb.version>3.0.2</jaxb.version>
@@ -152,7 +152,7 @@
<logback.version>1.2.10</logback.version>
<milo.version>0.6.3</milo.version>
<mockito.version>4.4.0</mockito.version>
- <netty.version>4.1.72.Final</netty.version>
+ <netty.version>4.1.75.Final</netty.version>
<owasp-dependency-check.version>6.5.1</owasp-dependency-check.version>
<pcap4j.version>1.8.2</pcap4j.version>
<slf4j.version>1.7.32</slf4j.version>
@@ -381,7 +381,7 @@
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-databind</artifactId>
- <version>${jackson.version}</version>
+ <version>${jackson.version}.2</version>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.dataformat</groupId>
[plc4x] 06/10: fix(plc4j/s7): Fixed some issues in the freshly merged S7 PR
Posted by cd...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
cdutz pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/plc4x.git
commit 00a857af424cc4cabc1f6afeb18d5310dd200669
Author: cdutz <ch...@c-ware.de>
AuthorDate: Thu Mar 31 16:44:23 2022 +0200
fix(plc4j/s7): Fixed some issues in the freshly merged S7 PR
---
plc4go/assets/testing/protocols/s7/DriverTestsuite.xml | 14 +++++++-------
.../java/s7/readwrite/configuration/S7Configuration.java | 6 +++---
.../plc4x/java/s7/readwrite/context/S7DriverContext.java | 10 ++++++----
3 files changed, 16 insertions(+), 14 deletions(-)
diff --git a/plc4go/assets/testing/protocols/s7/DriverTestsuite.xml b/plc4go/assets/testing/protocols/s7/DriverTestsuite.xml
index 04bf261..3c1173f 100644
--- a/plc4go/assets/testing/protocols/s7/DriverTestsuite.xml
+++ b/plc4go/assets/testing/protocols/s7/DriverTestsuite.xml
@@ -47,13 +47,6 @@
</COTPPacketConnectionRequest>
<parameters isList="true">
<COTPParameter>
- <parameterType dataType="uint" bitLength="8">194</parameterType>
- <parameterLength dataType="uint" bitLength="8">2</parameterLength>
- <COTPParameterCalledTsap>
- <tsapId dataType="uint" bitLength="16">256</tsapId>
- </COTPParameterCalledTsap>
- </COTPParameter>
- <COTPParameter>
<parameterType dataType="uint" bitLength="8">193</parameterType>
<parameterLength dataType="uint" bitLength="8">2</parameterLength>
<COTPParameterCallingTsap>
@@ -61,6 +54,13 @@
</COTPParameterCallingTsap>
</COTPParameter>
<COTPParameter>
+ <parameterType dataType="uint" bitLength="8">194</parameterType>
+ <parameterLength dataType="uint" bitLength="8">2</parameterLength>
+ <COTPParameterCalledTsap>
+ <tsapId dataType="uint" bitLength="16">256</tsapId>
+ </COTPParameterCalledTsap>
+ </COTPParameter>
+ <COTPParameter>
<parameterType dataType="uint" bitLength="8">192</parameterType>
<parameterLength dataType="uint" bitLength="8">1</parameterLength>
<COTPParameterTpduSize>
diff --git a/plc4j/drivers/s7/src/main/java/org/apache/plc4x/java/s7/readwrite/configuration/S7Configuration.java b/plc4j/drivers/s7/src/main/java/org/apache/plc4x/java/s7/readwrite/configuration/S7Configuration.java
index 385bb97..854440e 100644
--- a/plc4j/drivers/s7/src/main/java/org/apache/plc4x/java/s7/readwrite/configuration/S7Configuration.java
+++ b/plc4j/drivers/s7/src/main/java/org/apache/plc4x/java/s7/readwrite/configuration/S7Configuration.java
@@ -1,5 +1,5 @@
/*
-* Licensed to the Apache Software Foundation (ASF) under one
+ * Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
* regarding copyright ownership. The ASF licenses this file
@@ -161,8 +161,8 @@ public class S7Configuration implements Configuration, TcpTransportConfiguration
", local-slot=" + localSlot +
", local-tsap=" + localTsap +
", remote-rack=" + remoteRack +
- ", remot-slot=" + remoteSlot +
- ", remot-tsap=" + remoteTsap +
+ ", remote-slot=" + remoteSlot +
+ ", remote-tsap=" + remoteTsap +
", pduSize=" + pduSize +
", maxAmqCaller=" + maxAmqCaller +
", maxAmqCallee=" + maxAmqCallee +
diff --git a/plc4j/drivers/s7/src/main/java/org/apache/plc4x/java/s7/readwrite/context/S7DriverContext.java b/plc4j/drivers/s7/src/main/java/org/apache/plc4x/java/s7/readwrite/context/S7DriverContext.java
index 69eb544..b5b0abc 100644
--- a/plc4j/drivers/s7/src/main/java/org/apache/plc4x/java/s7/readwrite/context/S7DriverContext.java
+++ b/plc4j/drivers/s7/src/main/java/org/apache/plc4x/java/s7/readwrite/context/S7DriverContext.java
@@ -51,7 +51,10 @@ public class S7DriverContext implements DriverContext, HasConfiguration<S7Config
this.calledTsapId = configuration.remoteTsap;
}
this.controllerType = configuration.controllerType == null ? S7ControllerType.ANY : S7ControllerType.valueOf(configuration.controllerType);
-
+
+ // Initialize the parameters with initial version (Will be updated during the login process)
+ this.cotpTpduSize = getNearestMatchingTpduSize((short) configuration.getPduSize());
+
// The Siemens LOGO device seems to only work with very limited settings,
// so we're overriding some of the defaults.
if (this.controllerType == S7ControllerType.LOGO && configuration.pduSize == 1024) {
@@ -63,10 +66,9 @@ public class S7DriverContext implements DriverContext, HasConfiguration<S7Config
// I have never seen this happen in reality. Making is smaller would unnecessarily limit the
// size, so we're setting it to the maximum that can be included.
this.pduSize = cotpTpduSize.getSizeInBytes() - 16;
+
+ throw new RuntimeException("Hutz");
}
-
- // Initialize the parameters with initial version (Will be updated during the login process)
- this.cotpTpduSize = getNearestMatchingTpduSize((short) configuration.getPduSize());
this.maxAmqCaller = configuration.maxAmqCaller;
this.maxAmqCallee = configuration.maxAmqCallee;
[plc4x] 04/10: fix(codegen/plc4c): Fixed a wrong include statement
Posted by cd...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
cdutz pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/plc4x.git
commit ebe3bfc9c9d0a9931ae58b20d30ff7cec00e93f9
Author: cdutz <ch...@c-ware.de>
AuthorDate: Thu Mar 31 16:43:16 2022 +0200
fix(codegen/plc4c): Fixed a wrong include statement
---
plc4c/generated-sources/modbus/src/modbus_adu.c | 1 -
plc4c/generated-sources/modbus/src/modbus_constants.c | 1 -
plc4c/generated-sources/modbus/src/modbus_device_information_object.c | 1 -
plc4c/generated-sources/modbus/src/modbus_pdu.c | 1 -
.../modbus/src/modbus_pdu_read_file_record_request_item.c | 1 -
.../modbus/src/modbus_pdu_read_file_record_response_item.c | 1 -
.../modbus/src/modbus_pdu_write_file_record_request_item.c | 1 -
.../modbus/src/modbus_pdu_write_file_record_response_item.c | 1 -
8 files changed, 8 deletions(-)
diff --git a/plc4c/generated-sources/modbus/src/modbus_adu.c b/plc4c/generated-sources/modbus/src/modbus_adu.c
index 0dc4592..b7a2664 100644
--- a/plc4c/generated-sources/modbus/src/modbus_adu.c
+++ b/plc4c/generated-sources/modbus/src/modbus_adu.c
@@ -19,7 +19,6 @@
#include <stdio.h>
#include <plc4c/spi/evaluation_helper.h>
-#include <plc4c/driver_modbus_static_helper.h>
#include "modbus_adu.h"
// Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4c/generated-sources/modbus/src/modbus_constants.c b/plc4c/generated-sources/modbus/src/modbus_constants.c
index f956c24..e7a7627 100644
--- a/plc4c/generated-sources/modbus/src/modbus_constants.c
+++ b/plc4c/generated-sources/modbus/src/modbus_constants.c
@@ -19,7 +19,6 @@
#include <stdio.h>
#include <plc4c/spi/evaluation_helper.h>
-#include <plc4c/driver_modbus_static_helper.h>
#include "modbus_constants.h"
// Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4c/generated-sources/modbus/src/modbus_device_information_object.c b/plc4c/generated-sources/modbus/src/modbus_device_information_object.c
index b6258a7..533a730 100644
--- a/plc4c/generated-sources/modbus/src/modbus_device_information_object.c
+++ b/plc4c/generated-sources/modbus/src/modbus_device_information_object.c
@@ -19,7 +19,6 @@
#include <stdio.h>
#include <plc4c/spi/evaluation_helper.h>
-#include <plc4c/driver_modbus_static_helper.h>
#include "modbus_device_information_object.h"
// Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4c/generated-sources/modbus/src/modbus_pdu.c b/plc4c/generated-sources/modbus/src/modbus_pdu.c
index ff4d135..a423f0f 100644
--- a/plc4c/generated-sources/modbus/src/modbus_pdu.c
+++ b/plc4c/generated-sources/modbus/src/modbus_pdu.c
@@ -19,7 +19,6 @@
#include <stdio.h>
#include <plc4c/spi/evaluation_helper.h>
-#include <plc4c/driver_modbus_static_helper.h>
#include "modbus_pdu.h"
// Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4c/generated-sources/modbus/src/modbus_pdu_read_file_record_request_item.c b/plc4c/generated-sources/modbus/src/modbus_pdu_read_file_record_request_item.c
index 4a7c90d..86a7b10 100644
--- a/plc4c/generated-sources/modbus/src/modbus_pdu_read_file_record_request_item.c
+++ b/plc4c/generated-sources/modbus/src/modbus_pdu_read_file_record_request_item.c
@@ -19,7 +19,6 @@
#include <stdio.h>
#include <plc4c/spi/evaluation_helper.h>
-#include <plc4c/driver_modbus_static_helper.h>
#include "modbus_pdu_read_file_record_request_item.h"
// Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4c/generated-sources/modbus/src/modbus_pdu_read_file_record_response_item.c b/plc4c/generated-sources/modbus/src/modbus_pdu_read_file_record_response_item.c
index ecfcb90..003a113 100644
--- a/plc4c/generated-sources/modbus/src/modbus_pdu_read_file_record_response_item.c
+++ b/plc4c/generated-sources/modbus/src/modbus_pdu_read_file_record_response_item.c
@@ -19,7 +19,6 @@
#include <stdio.h>
#include <plc4c/spi/evaluation_helper.h>
-#include <plc4c/driver_modbus_static_helper.h>
#include "modbus_pdu_read_file_record_response_item.h"
// Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4c/generated-sources/modbus/src/modbus_pdu_write_file_record_request_item.c b/plc4c/generated-sources/modbus/src/modbus_pdu_write_file_record_request_item.c
index cbc3844..c0a43a8 100644
--- a/plc4c/generated-sources/modbus/src/modbus_pdu_write_file_record_request_item.c
+++ b/plc4c/generated-sources/modbus/src/modbus_pdu_write_file_record_request_item.c
@@ -19,7 +19,6 @@
#include <stdio.h>
#include <plc4c/spi/evaluation_helper.h>
-#include <plc4c/driver_modbus_static_helper.h>
#include "modbus_pdu_write_file_record_request_item.h"
// Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4c/generated-sources/modbus/src/modbus_pdu_write_file_record_response_item.c b/plc4c/generated-sources/modbus/src/modbus_pdu_write_file_record_response_item.c
index 8b2e392..d51d9a8 100644
--- a/plc4c/generated-sources/modbus/src/modbus_pdu_write_file_record_response_item.c
+++ b/plc4c/generated-sources/modbus/src/modbus_pdu_write_file_record_response_item.c
@@ -19,7 +19,6 @@
#include <stdio.h>
#include <plc4c/spi/evaluation_helper.h>
-#include <plc4c/driver_modbus_static_helper.h>
#include "modbus_pdu_write_file_record_response_item.h"
// Code generated by code-generation. DO NOT EDIT.
[plc4x] 02/10: fix(codegen/plc4go): Fixed a problem using unary expressions in plc4go static calls
Posted by cd...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
cdutz pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/plc4x.git
commit afbdbc2d0371441faae9bd96d0f09740bc88a90c
Author: cdutz <ch...@c-ware.de>
AuthorDate: Thu Mar 31 16:41:30 2022 +0200
fix(codegen/plc4go): Fixed a problem using unary expressions in plc4go static calls
---
.../org/apache/plc4x/language/go/GoLanguageTemplateHelper.java | 3 +++
.../org/apache/plc4x/java/test/readwrite/utils/StaticHelper.java | 8 ++++++++
2 files changed, 11 insertions(+)
diff --git a/code-generation/language-go/src/main/java/org/apache/plc4x/language/go/GoLanguageTemplateHelper.java b/code-generation/language-go/src/main/java/org/apache/plc4x/language/go/GoLanguageTemplateHelper.java
index 58df6ea..6dbbda4 100644
--- a/code-generation/language-go/src/main/java/org/apache/plc4x/language/go/GoLanguageTemplateHelper.java
+++ b/code-generation/language-go/src/main/java/org/apache/plc4x/language/go/GoLanguageTemplateHelper.java
@@ -939,6 +939,9 @@ public class GoLanguageTemplateHelper extends BaseFreemarkerLanguageTemplateHelp
if (i > 1) {
sb.append(", ");
}
+ if (arg instanceof UnaryTerm) {
+ arg = ((UnaryTerm) arg).getA();
+ }
if (arg instanceof VariableLiteral) {
tracer = tracer.dive("VariableLiteral");
VariableLiteral va = (VariableLiteral) arg;
diff --git a/code-generation/language-java/src/test/resources/integration-test/src/main/java/org/apache/plc4x/java/test/readwrite/utils/StaticHelper.java b/code-generation/language-java/src/test/resources/integration-test/src/main/java/org/apache/plc4x/java/test/readwrite/utils/StaticHelper.java
index 4e278a2..88078d1 100644
--- a/code-generation/language-java/src/test/resources/integration-test/src/main/java/org/apache/plc4x/java/test/readwrite/utils/StaticHelper.java
+++ b/code-generation/language-java/src/test/resources/integration-test/src/main/java/org/apache/plc4x/java/test/readwrite/utils/StaticHelper.java
@@ -79,4 +79,12 @@ public class StaticHelper {
}
+ public static short crcInt8(int num) {
+ return (byte) num;
+ }
+
+ public static short crcUint8(int num) {
+ return (short) num;
+ }
+
}