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 2020/11/18 18:49:01 UTC
[plc4x] branch feature/plc4go updated: - Fixed a the code that
broke a test in the ADS module
This is an automated email from the ASF dual-hosted git repository.
cdutz pushed a commit to branch feature/plc4go
in repository https://gitbox.apache.org/repos/asf/plc4x.git
The following commit(s) were added to refs/heads/feature/plc4go by this push:
new d4823f2 - Fixed a the code that broke a test in the ADS module
d4823f2 is described below
commit d4823f2225209589ef6722eaf8ab03356f1676ba
Author: Christofer Dutz <ch...@c-ware.de>
AuthorDate: Wed Nov 18 19:48:53 2020 +0100
- Fixed a the code that broke a test in the ADS module
---
.../plc4go/s7/readwrite/model/TransportSize.go | 36 +-----------------
.../plc4x/java/ads/field/AdsFieldHandler.java | 2 +-
.../plc4x/java/ads/protocol/AdsProtocolLogic.java | 9 +----
.../generated-sources/s7/include/transport_size.h | 4 +-
.../generated-sources/s7/src/transport_size.c | 44 ++--------------------
5 files changed, 11 insertions(+), 84 deletions(-)
diff --git a/plc4go/internal/plc4go/s7/readwrite/model/TransportSize.go b/plc4go/internal/plc4go/s7/readwrite/model/TransportSize.go
index b8ff30e..f33d668 100644
--- a/plc4go/internal/plc4go/s7/readwrite/model/TransportSize.go
+++ b/plc4go/internal/plc4go/s7/readwrite/model/TransportSize.go
@@ -62,8 +62,8 @@ const(
TransportSize_S5TIME TransportSize = 0x0C
TransportSize_LTIME TransportSize = 0x00
TransportSize_DATE TransportSize = 0x09
- TransportSize_TIME_OF_DAY TransportSize = 0x0A
- TransportSize_TOD TransportSize = 0x0A
+ TransportSize_TIME_OF_DAY TransportSize = 0x06
+ TransportSize_TOD TransportSize = 0x06
TransportSize_DATE_AND_TIME TransportSize = 0x0F
TransportSize_DT TransportSize = 0x0F
)
@@ -101,9 +101,6 @@ func (e TransportSize) Supported_S7_300() bool {
case 0x09: { /* '0x09' */
return true
}
- case 0x0A: { /* '0x0A' */
- return true
- }
case 0x0B: { /* '0x0B' */
return true
}
@@ -157,9 +154,6 @@ func (e TransportSize) Supported_LOGO() bool {
case 0x09: { /* '0x09' */
return true
}
- case 0x0A: { /* '0x0A' */
- return true
- }
case 0x0B: { /* '0x0B' */
return true
}
@@ -213,9 +207,6 @@ func (e TransportSize) SizeInBytes() uint8 {
case 0x09: { /* '0x09' */
return 2
}
- case 0x0A: { /* '0x0A' */
- return 4
- }
case 0x0B: { /* '0x0B' */
return 4
}
@@ -269,9 +260,6 @@ func (e TransportSize) Supported_S7_400() bool {
case 0x09: { /* '0x09' */
return true
}
- case 0x0A: { /* '0x0A' */
- return true
- }
case 0x0B: { /* '0x0B' */
return true
}
@@ -325,9 +313,6 @@ func (e TransportSize) Supported_S7_1200() bool {
case 0x09: { /* '0x09' */
return true
}
- case 0x0A: { /* '0x0A' */
- return true
- }
case 0x0B: { /* '0x0B' */
return true
}
@@ -381,9 +366,6 @@ func (e TransportSize) SizeCode() uint8 {
case 0x09: { /* '0x09' */
return 'X'
}
- case 0x0A: { /* '0x0A' */
- return 'X'
- }
case 0x0B: { /* '0x0B' */
return 'X'
}
@@ -437,9 +419,6 @@ func (e TransportSize) Supported_S7_1500() bool {
case 0x09: { /* '0x09' */
return true
}
- case 0x0A: { /* '0x0A' */
- return true
- }
case 0x0B: { /* '0x0B' */
return true
}
@@ -493,9 +472,6 @@ func (e TransportSize) DataTransportSize() DataTransportSize {
case 0x09: { /* '0x09' */
return DataTransportSize_BYTE_WORD_DWORD
}
- case 0x0A: { /* '0x0A' */
- return DataTransportSize_BYTE_WORD_DWORD
- }
case 0x0B: { /* '0x0B' */
return 0
}
@@ -549,9 +525,6 @@ func (e TransportSize) BaseType() TransportSize {
case 0x09: { /* '0x09' */
return 0
}
- case 0x0A: { /* '0x0A' */
- return 0
- }
case 0x0B: { /* '0x0B' */
return 0
}
@@ -605,9 +578,6 @@ func (e TransportSize) DataProtocolId() string {
case 0x09: { /* '0x09' */
return "IEC61131_DATE"
}
- case 0x0A: { /* '0x0A' */
- return "IEC61131_TIME_OF_DAY"
- }
case 0x0B: { /* '0x0B' */
return "IEC61131_TIME"
}
@@ -650,8 +620,6 @@ func TransportSizeValueOf(value int8) TransportSize {
return TransportSize_REAL
case 0x09:
return TransportSize_DATE
- case 0x0A:
- return TransportSize_TIME_OF_DAY
case 0x0B:
return TransportSize_TIME
case 0x0C:
diff --git a/plc4j/drivers/ads/src/main/java/org/apache/plc4x/java/ads/field/AdsFieldHandler.java b/plc4j/drivers/ads/src/main/java/org/apache/plc4x/java/ads/field/AdsFieldHandler.java
index fdeaebd..4a4b732 100644
--- a/plc4j/drivers/ads/src/main/java/org/apache/plc4x/java/ads/field/AdsFieldHandler.java
+++ b/plc4j/drivers/ads/src/main/java/org/apache/plc4x/java/ads/field/AdsFieldHandler.java
@@ -29,7 +29,7 @@ public class AdsFieldHandler implements PlcFieldHandler {
if (DirectAdsStringField.matches(fieldQuery)) {
return DirectAdsStringField.of(fieldQuery);
} else if (DirectAdsField.matches(fieldQuery)) {
- return SymbolicAdsField.of(fieldQuery);
+ return DirectAdsField.of(fieldQuery);
} else if (SymbolicAdsStringField.matches(fieldQuery)) {
return SymbolicAdsStringField.of(fieldQuery);
} else if (SymbolicAdsField.matches(fieldQuery)) {
diff --git a/plc4j/drivers/ads/src/main/java/org/apache/plc4x/java/ads/protocol/AdsProtocolLogic.java b/plc4j/drivers/ads/src/main/java/org/apache/plc4x/java/ads/protocol/AdsProtocolLogic.java
index d53f84d..eb95ba1 100644
--- a/plc4j/drivers/ads/src/main/java/org/apache/plc4x/java/ads/protocol/AdsProtocolLogic.java
+++ b/plc4j/drivers/ads/src/main/java/org/apache/plc4x/java/ads/protocol/AdsProtocolLogic.java
@@ -19,10 +19,7 @@ under the License.
package org.apache.plc4x.java.ads.protocol;
import org.apache.plc4x.java.ads.configuration.AdsConfiguration;
-import org.apache.plc4x.java.ads.field.AdsField;
-import org.apache.plc4x.java.ads.field.AdsStringField;
-import org.apache.plc4x.java.ads.field.DirectAdsField;
-import org.apache.plc4x.java.ads.field.SymbolicAdsField;
+import org.apache.plc4x.java.ads.field.*;
import org.apache.plc4x.java.ads.readwrite.*;
import org.apache.plc4x.java.ads.readwrite.io.DataItemIO;
import org.apache.plc4x.java.ads.readwrite.types.AdsDataType;
@@ -340,9 +337,7 @@ public class AdsProtocolLogic extends Plc4xProtocolBase<AmsTCPPacket> implements
private ResponseItem<PlcValue> parsePlcValue(AdsField field, ReadBuffer readBuffer) {
try {
int strLen = 0;
- if (field.getAdsDataType() == AdsDataType.STRING) {
- strLen = (field instanceof AdsStringField) ? ((AdsStringField) field).getStringLength() : 256;
- } else if (field.getAdsDataType() == AdsDataType.WSTRING) {
+ if ((field.getAdsDataType() == AdsDataType.STRING) || (field.getAdsDataType() == AdsDataType.WSTRING)) {
strLen = (field instanceof AdsStringField) ? ((AdsStringField) field).getStringLength() : 256;
}
final int stringLength = strLen;
diff --git a/sandbox/plc4c/generated-sources/s7/include/transport_size.h b/sandbox/plc4c/generated-sources/s7/include/transport_size.h
index e2f6a5a..f9c7080 100644
--- a/sandbox/plc4c/generated-sources/s7/include/transport_size.h
+++ b/sandbox/plc4c/generated-sources/s7/include/transport_size.h
@@ -53,8 +53,8 @@ enum plc4c_s7_read_write_transport_size {
plc4c_s7_read_write_transport_size_S5TIME = 0x0C,
plc4c_s7_read_write_transport_size_LTIME = 0x00,
plc4c_s7_read_write_transport_size_DATE = 0x09,
- plc4c_s7_read_write_transport_size_TIME_OF_DAY = 0x0A,
- plc4c_s7_read_write_transport_size_TOD = 0x0A,
+ plc4c_s7_read_write_transport_size_TIME_OF_DAY = 0x06,
+ plc4c_s7_read_write_transport_size_TOD = 0x06,
plc4c_s7_read_write_transport_size_DATE_AND_TIME = 0x0F,
plc4c_s7_read_write_transport_size_DT = 0x0F
};
diff --git a/sandbox/plc4c/generated-sources/s7/src/transport_size.c b/sandbox/plc4c/generated-sources/s7/src/transport_size.c
index 3f0cca5..d71a6bd 100644
--- a/sandbox/plc4c/generated-sources/s7/src/transport_size.c
+++ b/sandbox/plc4c/generated-sources/s7/src/transport_size.c
@@ -61,9 +61,6 @@ plc4c_s7_read_write_transport_size plc4c_s7_read_write_transport_size_value_of(c
if(strcmp(value_string, "DATE") == 0) {
return plc4c_s7_read_write_transport_size_DATE;
}
- if(strcmp(value_string, "TIME_OF_DAY") == 0) {
- return plc4c_s7_read_write_transport_size_TIME_OF_DAY;
- }
if(strcmp(value_string, "TIME") == 0) {
return plc4c_s7_read_write_transport_size_TIME;
}
@@ -119,21 +116,18 @@ plc4c_s7_read_write_transport_size plc4c_s7_read_write_transport_size_value_for_
return plc4c_s7_read_write_transport_size_DATE;
}
case 10: {
- return plc4c_s7_read_write_transport_size_TIME_OF_DAY;
- }
- case 11: {
return plc4c_s7_read_write_transport_size_TIME;
}
- case 12: {
+ case 11: {
return plc4c_s7_read_write_transport_size_S5TIME;
}
- case 13: {
+ case 12: {
return plc4c_s7_read_write_transport_size_DATE_AND_TIME;
}
- case 14: {
+ case 13: {
return plc4c_s7_read_write_transport_size_WCHAR;
}
- case 15: {
+ case 14: {
return plc4c_s7_read_write_transport_size_LREAL;
}
default: {
@@ -174,9 +168,6 @@ bool plc4c_s7_read_write_transport_size_get_supported__s7_300(plc4c_s7_read_writ
case plc4c_s7_read_write_transport_size_DATE: { /* '0x09' */
return true;
}
- case plc4c_s7_read_write_transport_size_TIME_OF_DAY: { /* '0x0A' */
- return true;
- }
case plc4c_s7_read_write_transport_size_TIME: { /* '0x0B' */
return true;
}
@@ -230,9 +221,6 @@ bool plc4c_s7_read_write_transport_size_get_supported__logo(plc4c_s7_read_write_
case plc4c_s7_read_write_transport_size_DATE: { /* '0x09' */
return true;
}
- case plc4c_s7_read_write_transport_size_TIME_OF_DAY: { /* '0x0A' */
- return true;
- }
case plc4c_s7_read_write_transport_size_TIME: { /* '0x0B' */
return true;
}
@@ -286,9 +274,6 @@ uint8_t plc4c_s7_read_write_transport_size_get_size_in_bytes(plc4c_s7_read_write
case plc4c_s7_read_write_transport_size_DATE: { /* '0x09' */
return 2;
}
- case plc4c_s7_read_write_transport_size_TIME_OF_DAY: { /* '0x0A' */
- return 4;
- }
case plc4c_s7_read_write_transport_size_TIME: { /* '0x0B' */
return 4;
}
@@ -342,9 +327,6 @@ bool plc4c_s7_read_write_transport_size_get_supported__s7_400(plc4c_s7_read_writ
case plc4c_s7_read_write_transport_size_DATE: { /* '0x09' */
return true;
}
- case plc4c_s7_read_write_transport_size_TIME_OF_DAY: { /* '0x0A' */
- return true;
- }
case plc4c_s7_read_write_transport_size_TIME: { /* '0x0B' */
return true;
}
@@ -398,9 +380,6 @@ bool plc4c_s7_read_write_transport_size_get_supported__s7_1200(plc4c_s7_read_wri
case plc4c_s7_read_write_transport_size_DATE: { /* '0x09' */
return true;
}
- case plc4c_s7_read_write_transport_size_TIME_OF_DAY: { /* '0x0A' */
- return true;
- }
case plc4c_s7_read_write_transport_size_TIME: { /* '0x0B' */
return true;
}
@@ -454,9 +433,6 @@ uint8_t plc4c_s7_read_write_transport_size_get_size_code(plc4c_s7_read_write_tra
case plc4c_s7_read_write_transport_size_DATE: { /* '0x09' */
return 'X';
}
- case plc4c_s7_read_write_transport_size_TIME_OF_DAY: { /* '0x0A' */
- return 'X';
- }
case plc4c_s7_read_write_transport_size_TIME: { /* '0x0B' */
return 'X';
}
@@ -510,9 +486,6 @@ bool plc4c_s7_read_write_transport_size_get_supported__s7_1500(plc4c_s7_read_wri
case plc4c_s7_read_write_transport_size_DATE: { /* '0x09' */
return true;
}
- case plc4c_s7_read_write_transport_size_TIME_OF_DAY: { /* '0x0A' */
- return true;
- }
case plc4c_s7_read_write_transport_size_TIME: { /* '0x0B' */
return true;
}
@@ -566,9 +539,6 @@ plc4c_s7_read_write_data_transport_size plc4c_s7_read_write_transport_size_get_d
case plc4c_s7_read_write_transport_size_DATE: { /* '0x09' */
return plc4c_s7_read_write_data_transport_size_BYTE_WORD_DWORD;
}
- case plc4c_s7_read_write_transport_size_TIME_OF_DAY: { /* '0x0A' */
- return plc4c_s7_read_write_data_transport_size_BYTE_WORD_DWORD;
- }
case plc4c_s7_read_write_transport_size_TIME: { /* '0x0B' */
return -1;
}
@@ -622,9 +592,6 @@ plc4c_s7_read_write_transport_size plc4c_s7_read_write_transport_size_get_base_t
case plc4c_s7_read_write_transport_size_DATE: { /* '0x09' */
return -1;
}
- case plc4c_s7_read_write_transport_size_TIME_OF_DAY: { /* '0x0A' */
- return -1;
- }
case plc4c_s7_read_write_transport_size_TIME: { /* '0x0B' */
return -1;
}
@@ -678,9 +645,6 @@ char* plc4c_s7_read_write_transport_size_get_data_protocol_id(plc4c_s7_read_writ
case plc4c_s7_read_write_transport_size_DATE: { /* '0x09' */
return "IEC61131_DATE";
}
- case plc4c_s7_read_write_transport_size_TIME_OF_DAY: { /* '0x0A' */
- return "IEC61131_TIME_OF_DAY";
- }
case plc4c_s7_read_write_transport_size_TIME: { /* '0x0B' */
return "IEC61131_TIME";
}