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 2021/01/31 13:01:21 UTC
[plc4x] 05/07: PLC4X-272 When splitting up large requests,
too big sub-requests are generated (S7) - When splitting up into
more than one request,
the new request was correctly initialized with the empty-request size,
however the current element wasn't added. This should now be fixed
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 12f497d3c6dcf0e3750a2c2a90444807e1a8fadc
Author: Christofer Dutz <ch...@c-ware.de>
AuthorDate: Mon Jan 18 13:06:10 2021 +0100
PLC4X-272
When splitting up large requests, too big sub-requests are generated (S7)
- When splitting up into more than one request, the new request was correctly initialized with the empty-request size, however the current element wasn't added. This should now be fixed
---
RELEASE_NOTES | 19 +-
.../plc4go/s7/readwrite/model/TransportSize.go | 811 ++++-----------------
2 files changed, 147 insertions(+), 683 deletions(-)
diff --git a/RELEASE_NOTES b/RELEASE_NOTES
index 60fbf4e..e90b42d 100644
--- a/RELEASE_NOTES
+++ b/RELEASE_NOTES
@@ -1,18 +1,5 @@
==============================================================
-(Unreleased) Apache PLC4X 0.9.0-SNAPSHOT
-==============================================================
-
-New Features
-------------
-
-Incompatible changes
---------------------
-
-Bug Fixes
----------
-
-==============================================================
-Apache PLC4X 0.8.0
+(Unreleased) Apache PLC4X 0.8.0-SNAPSHOT
==============================================================
This is an ordinary PLC4X release, containing changes that
@@ -92,7 +79,6 @@ PLC4X-218 [Scraper] After stopping the scraper still the
terminate
PLC4X-239 Read DTL (Date and Time)
PLC4X-240 Protocol error in reading string
-PLC4X-246 S7 driver hangs on read
PLC4X-245 [Modbus] Apache NiFi processor throws
java.io.IOException after a while
PLC4X-255 Kafka Connector Source Task doesn't block within poll()
@@ -101,9 +87,6 @@ PLC4X-261 Pooled connection manager returns a connection that isn't
connected in some situations.
PLC4X-272 When splitting up large requests, too big sub-requests
are generated (S7)
-PLC4X-256 ReadBuffer truncate last byte of even small payloads
-PLC4X-262 Error in reading Array
-PLC4X-270 Ads driver does not accept double-digit array indexes
==============================================================
Apache PLC4X 0.7.0
diff --git a/plc4go/internal/plc4go/s7/readwrite/model/TransportSize.go b/plc4go/internal/plc4go/s7/readwrite/model/TransportSize.go
index 38f3d8d..26cf716 100644
--- a/plc4go/internal/plc4go/s7/readwrite/model/TransportSize.go
+++ b/plc4go/internal/plc4go/s7/readwrite/model/TransportSize.go
@@ -27,11 +27,10 @@ type TransportSize int8
type ITransportSize interface {
Supported_S7_300() bool
Supported_LOGO() bool
- Code() uint8
SizeInBytes() uint8
Supported_S7_400() bool
Supported_S7_1200() bool
- ShortName() uint8
+ SizeCode() uint8
Supported_S7_1500() bool
DataTransportSize() DataTransportSize
BaseType() TransportSize
@@ -42,35 +41,38 @@ type ITransportSize interface {
const(
TransportSize_BOOL TransportSize = 0x01
TransportSize_BYTE TransportSize = 0x02
- TransportSize_WORD TransportSize = 0x03
- TransportSize_DWORD TransportSize = 0x04
- TransportSize_LWORD TransportSize = 0x05
- TransportSize_INT TransportSize = 0x06
- TransportSize_UINT TransportSize = 0x07
- TransportSize_SINT TransportSize = 0x08
- TransportSize_USINT TransportSize = 0x09
- TransportSize_DINT TransportSize = 0x0A
- TransportSize_UDINT TransportSize = 0x0B
- TransportSize_LINT TransportSize = 0x0C
- TransportSize_ULINT TransportSize = 0x0D
- TransportSize_REAL TransportSize = 0x0E
- TransportSize_LREAL TransportSize = 0x0F
- TransportSize_CHAR TransportSize = 0x10
- TransportSize_WCHAR TransportSize = 0x11
- TransportSize_STRING TransportSize = 0x12
- TransportSize_WSTRING TransportSize = 0x13
- TransportSize_TIME TransportSize = 0x14
- TransportSize_LTIME TransportSize = 0x16
- TransportSize_DATE TransportSize = 0x17
- TransportSize_TIME_OF_DAY TransportSize = 0x18
- TransportSize_TOD TransportSize = 0x19
- TransportSize_DATE_AND_TIME TransportSize = 0x1A
- TransportSize_DT TransportSize = 0x1B
+ TransportSize_WORD TransportSize = 0x04
+ TransportSize_DWORD TransportSize = 0x06
+ TransportSize_LWORD TransportSize = 0x00
+ TransportSize_INT TransportSize = 0x05
+ TransportSize_UINT TransportSize = 0x05
+ TransportSize_SINT TransportSize = 0x02
+ TransportSize_USINT TransportSize = 0x02
+ TransportSize_DINT TransportSize = 0x07
+ TransportSize_UDINT TransportSize = 0x07
+ TransportSize_LINT TransportSize = 0x00
+ TransportSize_ULINT TransportSize = 0x00
+ TransportSize_REAL TransportSize = 0x08
+ TransportSize_LREAL TransportSize = 0x30
+ TransportSize_CHAR TransportSize = 0x03
+ TransportSize_WCHAR TransportSize = 0x13
+ TransportSize_STRING TransportSize = 0x03
+ TransportSize_WSTRING TransportSize = 0x00
+ TransportSize_TIME TransportSize = 0x0B
+ TransportSize_LTIME TransportSize = 0x00
+ TransportSize_DATE TransportSize = 0x09
+ TransportSize_TIME_OF_DAY TransportSize = 0x06
+ TransportSize_TOD TransportSize = 0x06
+ TransportSize_DATE_AND_TIME TransportSize = 0x0F
+ TransportSize_DT TransportSize = 0x0F
)
func (e TransportSize) Supported_S7_300() bool {
switch e {
+ case 0x00: { /* '0x00' */
+ return false
+ }
case 0x01: { /* '0x01' */
return true
}
@@ -84,71 +86,32 @@ func (e TransportSize) Supported_S7_300() bool {
return true
}
case 0x05: { /* '0x05' */
- return false
+ return true
}
case 0x06: { /* '0x06' */
return true
}
case 0x07: { /* '0x07' */
- return false
+ return true
}
case 0x08: { /* '0x08' */
- return false
+ return true
}
case 0x09: { /* '0x09' */
- return false
- }
- case 0x0A: { /* '0x0A' */
return true
}
case 0x0B: { /* '0x0B' */
- return false
- }
- case 0x0C: { /* '0x0C' */
- return false
- }
- case 0x0D: { /* '0x0D' */
- return false
- }
- case 0x0E: { /* '0x0E' */
return true
}
case 0x0F: { /* '0x0F' */
- return false
- }
- case 0x10: { /* '0x10' */
- return true
- }
- case 0x11: { /* '0x11' */
- return false
- }
- case 0x12: { /* '0x12' */
return true
}
case 0x13: { /* '0x13' */
return false
}
- case 0x14: { /* '0x14' */
- return true
- }
- case 0x16: { /* '0x16' */
+ case 0x30: { /* '0x30' */
return false
}
- case 0x17: { /* '0x17' */
- return true
- }
- case 0x18: { /* '0x18' */
- return true
- }
- case 0x19: { /* '0x19' */
- return true
- }
- case 0x1A: { /* '0x1A' */
- return true
- }
- case 0x1B: { /* '0x1B' */
- return true
- }
default: {
return false
}
@@ -157,6 +120,9 @@ func (e TransportSize) Supported_S7_300() bool {
func (e TransportSize) Supported_LOGO() bool {
switch e {
+ case 0x00: { /* '0x00' */
+ return false
+ }
case 0x01: { /* '0x01' */
return true
}
@@ -170,7 +136,7 @@ func (e TransportSize) Supported_LOGO() bool {
return true
}
case 0x05: { /* '0x05' */
- return false
+ return true
}
case 0x06: { /* '0x06' */
return true
@@ -184,55 +150,16 @@ func (e TransportSize) Supported_LOGO() bool {
case 0x09: { /* '0x09' */
return true
}
- case 0x0A: { /* '0x0A' */
- return true
- }
case 0x0B: { /* '0x0B' */
return true
}
- case 0x0C: { /* '0x0C' */
- return false
- }
- case 0x0D: { /* '0x0D' */
- return false
- }
- case 0x0E: { /* '0x0E' */
- return true
- }
case 0x0F: { /* '0x0F' */
return false
}
- case 0x10: { /* '0x10' */
- return true
- }
- case 0x11: { /* '0x11' */
- return true
- }
- case 0x12: { /* '0x12' */
- return true
- }
case 0x13: { /* '0x13' */
return true
}
- case 0x14: { /* '0x14' */
- return true
- }
- case 0x16: { /* '0x16' */
- return false
- }
- case 0x17: { /* '0x17' */
- return true
- }
- case 0x18: { /* '0x18' */
- return true
- }
- case 0x19: { /* '0x19' */
- return true
- }
- case 0x1A: { /* '0x1A' */
- return false
- }
- case 0x1B: { /* '0x1B' */
+ case 0x30: { /* '0x30' */
return false
}
default: {
@@ -241,94 +168,11 @@ func (e TransportSize) Supported_LOGO() bool {
}
}
-func (e TransportSize) Code() uint8 {
- switch e {
- case 0x01: { /* '0x01' */
- return 0x01
- }
- case 0x02: { /* '0x02' */
- return 0x02
- }
- case 0x03: { /* '0x03' */
- return 0x04
- }
- case 0x04: { /* '0x04' */
- return 0x06
- }
- case 0x05: { /* '0x05' */
- return 0x00
- }
- case 0x06: { /* '0x06' */
- return 0x05
- }
- case 0x07: { /* '0x07' */
- return 0x05
- }
- case 0x08: { /* '0x08' */
- return 0x02
- }
- case 0x09: { /* '0x09' */
- return 0x02
- }
- case 0x0A: { /* '0x0A' */
- return 0x07
- }
- case 0x0B: { /* '0x0B' */
- return 0x07
- }
- case 0x0C: { /* '0x0C' */
- return 0x00
- }
- case 0x0D: { /* '0x0D' */
- return 0x00
- }
- case 0x0E: { /* '0x0E' */
- return 0x08
- }
- case 0x0F: { /* '0x0F' */
- return 0x30
- }
- case 0x10: { /* '0x10' */
- return 0x03
- }
- case 0x11: { /* '0x11' */
- return 0x13
- }
- case 0x12: { /* '0x12' */
- return 0x03
- }
- case 0x13: { /* '0x13' */
- return 0x00
- }
- case 0x14: { /* '0x14' */
- return 0x0B
- }
- case 0x16: { /* '0x16' */
- return 0x00
- }
- case 0x17: { /* '0x17' */
- return 0x09
- }
- case 0x18: { /* '0x18' */
- return 0x06
- }
- case 0x19: { /* '0x19' */
- return 0x06
- }
- case 0x1A: { /* '0x1A' */
- return 0x0F
- }
- case 0x1B: { /* '0x1B' */
- return 0x0F
- }
- default: {
- return 0
- }
- }
-}
-
func (e TransportSize) SizeInBytes() uint8 {
switch e {
+ case 0x00: { /* '0x00' */
+ return 8
+ }
case 0x01: { /* '0x01' */
return 1
}
@@ -336,77 +180,38 @@ func (e TransportSize) SizeInBytes() uint8 {
return 1
}
case 0x03: { /* '0x03' */
- return 2
+ return 1
}
case 0x04: { /* '0x04' */
- return 4
+ return 2
}
case 0x05: { /* '0x05' */
- return 8
+ return 2
}
case 0x06: { /* '0x06' */
- return 2
+ return 4
}
case 0x07: { /* '0x07' */
- return 2
+ return 4
}
case 0x08: { /* '0x08' */
- return 1
+ return 4
}
case 0x09: { /* '0x09' */
- return 1
- }
- case 0x0A: { /* '0x0A' */
- return 4
+ return 2
}
case 0x0B: { /* '0x0B' */
return 4
}
- case 0x0C: { /* '0x0C' */
- return 8
- }
- case 0x0D: { /* '0x0D' */
- return 16
- }
- case 0x0E: { /* '0x0E' */
- return 4
- }
case 0x0F: { /* '0x0F' */
- return 8
- }
- case 0x10: { /* '0x10' */
- return 1
- }
- case 0x11: { /* '0x11' */
- return 2
- }
- case 0x12: { /* '0x12' */
- return 1
+ return 12
}
case 0x13: { /* '0x13' */
return 2
}
- case 0x14: { /* '0x14' */
- return 4
- }
- case 0x16: { /* '0x16' */
+ case 0x30: { /* '0x30' */
return 8
}
- case 0x17: { /* '0x17' */
- return 2
- }
- case 0x18: { /* '0x18' */
- return 4
- }
- case 0x19: { /* '0x19' */
- return 4
- }
- case 0x1A: { /* '0x1A' */
- return 12
- }
- case 0x1B: { /* '0x1B' */
- return 12
- }
default: {
return 0
}
@@ -415,6 +220,9 @@ func (e TransportSize) SizeInBytes() uint8 {
func (e TransportSize) Supported_S7_400() bool {
switch e {
+ case 0x00: { /* '0x00' */
+ return false
+ }
case 0x01: { /* '0x01' */
return true
}
@@ -428,71 +236,32 @@ func (e TransportSize) Supported_S7_400() bool {
return true
}
case 0x05: { /* '0x05' */
- return false
+ return true
}
case 0x06: { /* '0x06' */
return true
}
case 0x07: { /* '0x07' */
- return false
+ return true
}
case 0x08: { /* '0x08' */
- return false
+ return true
}
case 0x09: { /* '0x09' */
- return false
- }
- case 0x0A: { /* '0x0A' */
return true
}
case 0x0B: { /* '0x0B' */
- return false
- }
- case 0x0C: { /* '0x0C' */
- return false
- }
- case 0x0D: { /* '0x0D' */
- return false
- }
- case 0x0E: { /* '0x0E' */
return true
}
case 0x0F: { /* '0x0F' */
- return false
- }
- case 0x10: { /* '0x10' */
- return true
- }
- case 0x11: { /* '0x11' */
- return false
- }
- case 0x12: { /* '0x12' */
return true
}
case 0x13: { /* '0x13' */
return false
}
- case 0x14: { /* '0x14' */
- return true
- }
- case 0x16: { /* '0x16' */
+ case 0x30: { /* '0x30' */
return false
}
- case 0x17: { /* '0x17' */
- return true
- }
- case 0x18: { /* '0x18' */
- return true
- }
- case 0x19: { /* '0x19' */
- return true
- }
- case 0x1A: { /* '0x1A' */
- return true
- }
- case 0x1B: { /* '0x1B' */
- return true
- }
default: {
return false
}
@@ -501,6 +270,9 @@ func (e TransportSize) Supported_S7_400() bool {
func (e TransportSize) Supported_S7_1200() bool {
switch e {
+ case 0x00: { /* '0x00' */
+ return false
+ }
case 0x01: { /* '0x01' */
return true
}
@@ -514,7 +286,7 @@ func (e TransportSize) Supported_S7_1200() bool {
return true
}
case 0x05: { /* '0x05' */
- return false
+ return true
}
case 0x06: { /* '0x06' */
return true
@@ -528,65 +300,29 @@ func (e TransportSize) Supported_S7_1200() bool {
case 0x09: { /* '0x09' */
return true
}
- case 0x0A: { /* '0x0A' */
- return true
- }
case 0x0B: { /* '0x0B' */
return true
}
- case 0x0C: { /* '0x0C' */
- return false
- }
- case 0x0D: { /* '0x0D' */
- return false
- }
- case 0x0E: { /* '0x0E' */
- return true
- }
case 0x0F: { /* '0x0F' */
- return true
- }
- case 0x10: { /* '0x10' */
- return true
- }
- case 0x11: { /* '0x11' */
- return true
- }
- case 0x12: { /* '0x12' */
- return true
- }
- case 0x13: { /* '0x13' */
- return true
- }
- case 0x14: { /* '0x14' */
- return true
- }
- case 0x16: { /* '0x16' */
return false
}
- case 0x17: { /* '0x17' */
- return true
- }
- case 0x18: { /* '0x18' */
+ case 0x13: { /* '0x13' */
return true
}
- case 0x19: { /* '0x19' */
+ case 0x30: { /* '0x30' */
return true
}
- case 0x1A: { /* '0x1A' */
- return false
- }
- case 0x1B: { /* '0x1B' */
- return false
- }
default: {
return false
}
}
}
-func (e TransportSize) ShortName() uint8 {
+func (e TransportSize) SizeCode() uint8 {
switch e {
+ case 0x00: { /* '0x00' */
+ return 'X'
+ }
case 0x01: { /* '0x01' */
return 'X'
}
@@ -594,75 +330,36 @@ func (e TransportSize) ShortName() uint8 {
return 'B'
}
case 0x03: { /* '0x03' */
- return 'W'
+ return 'B'
}
case 0x04: { /* '0x04' */
- return 'D'
+ return 'W'
}
case 0x05: { /* '0x05' */
- return 'X'
+ return 'W'
}
case 0x06: { /* '0x06' */
- return 'W'
+ return 'D'
}
case 0x07: { /* '0x07' */
- return 'W'
- }
- case 0x08: { /* '0x08' */
- return 'B'
- }
- case 0x09: { /* '0x09' */
- return 'B'
- }
- case 0x0A: { /* '0x0A' */
return 'D'
}
- case 0x0B: { /* '0x0B' */
+ case 0x08: { /* '0x08' */
return 'D'
}
- case 0x0C: { /* '0x0C' */
+ case 0x09: { /* '0x09' */
return 'X'
}
- case 0x0D: { /* '0x0D' */
+ case 0x0B: { /* '0x0B' */
return 'X'
}
- case 0x0E: { /* '0x0E' */
- return 'D'
- }
case 0x0F: { /* '0x0F' */
return 'X'
}
- case 0x10: { /* '0x10' */
- return 'B'
- }
- case 0x11: { /* '0x11' */
- return 'X'
- }
- case 0x12: { /* '0x12' */
- return 'X'
- }
case 0x13: { /* '0x13' */
return 'X'
}
- case 0x14: { /* '0x14' */
- return 'X'
- }
- case 0x16: { /* '0x16' */
- return 'X'
- }
- case 0x17: { /* '0x17' */
- return 'X'
- }
- case 0x18: { /* '0x18' */
- return 'X'
- }
- case 0x19: { /* '0x19' */
- return 'X'
- }
- case 0x1A: { /* '0x1A' */
- return 'X'
- }
- case 0x1B: { /* '0x1B' */
+ case 0x30: { /* '0x30' */
return 'X'
}
default: {
@@ -673,6 +370,9 @@ func (e TransportSize) ShortName() uint8 {
func (e TransportSize) Supported_S7_1500() bool {
switch e {
+ case 0x00: { /* '0x00' */
+ return true
+ }
case 0x01: { /* '0x01' */
return true
}
@@ -700,55 +400,16 @@ func (e TransportSize) Supported_S7_1500() bool {
case 0x09: { /* '0x09' */
return true
}
- case 0x0A: { /* '0x0A' */
- return true
- }
case 0x0B: { /* '0x0B' */
return true
}
- case 0x0C: { /* '0x0C' */
- return true
- }
- case 0x0D: { /* '0x0D' */
- return true
- }
- case 0x0E: { /* '0x0E' */
- return true
- }
case 0x0F: { /* '0x0F' */
return true
}
- case 0x10: { /* '0x10' */
- return true
- }
- case 0x11: { /* '0x11' */
- return true
- }
- case 0x12: { /* '0x12' */
- return true
- }
case 0x13: { /* '0x13' */
return true
}
- case 0x14: { /* '0x14' */
- return true
- }
- case 0x16: { /* '0x16' */
- return true
- }
- case 0x17: { /* '0x17' */
- return true
- }
- case 0x18: { /* '0x18' */
- return true
- }
- case 0x19: { /* '0x19' */
- return true
- }
- case 0x1A: { /* '0x1A' */
- return true
- }
- case 0x1B: { /* '0x1B' */
+ case 0x30: { /* '0x30' */
return true
}
default: {
@@ -759,6 +420,9 @@ func (e TransportSize) Supported_S7_1500() bool {
func (e TransportSize) DataTransportSize() DataTransportSize {
switch e {
+ case 0x00: { /* '0x00' */
+ return 0
+ }
case 0x01: { /* '0x01' */
return DataTransportSize_BIT
}
@@ -772,10 +436,10 @@ func (e TransportSize) DataTransportSize() DataTransportSize {
return DataTransportSize_BYTE_WORD_DWORD
}
case 0x05: { /* '0x05' */
- return 0
+ return DataTransportSize_INTEGER
}
case 0x06: { /* '0x06' */
- return DataTransportSize_INTEGER
+ return DataTransportSize_BYTE_WORD_DWORD
}
case 0x07: { /* '0x07' */
return DataTransportSize_INTEGER
@@ -786,55 +450,16 @@ func (e TransportSize) DataTransportSize() DataTransportSize {
case 0x09: { /* '0x09' */
return DataTransportSize_BYTE_WORD_DWORD
}
- case 0x0A: { /* '0x0A' */
- return DataTransportSize_INTEGER
- }
case 0x0B: { /* '0x0B' */
- return DataTransportSize_INTEGER
- }
- case 0x0C: { /* '0x0C' */
return 0
}
- case 0x0D: { /* '0x0D' */
- return 0
- }
- case 0x0E: { /* '0x0E' */
- return DataTransportSize_BYTE_WORD_DWORD
- }
case 0x0F: { /* '0x0F' */
return 0
}
- case 0x10: { /* '0x10' */
- return DataTransportSize_BYTE_WORD_DWORD
- }
- case 0x11: { /* '0x11' */
- return 0
- }
- case 0x12: { /* '0x12' */
- return DataTransportSize_BYTE_WORD_DWORD
- }
case 0x13: { /* '0x13' */
return 0
}
- case 0x14: { /* '0x14' */
- return 0
- }
- case 0x16: { /* '0x16' */
- return 0
- }
- case 0x17: { /* '0x17' */
- return DataTransportSize_BYTE_WORD_DWORD
- }
- case 0x18: { /* '0x18' */
- return DataTransportSize_BYTE_WORD_DWORD
- }
- case 0x19: { /* '0x19' */
- return DataTransportSize_BYTE_WORD_DWORD
- }
- case 0x1A: { /* '0x1A' */
- return 0
- }
- case 0x1B: { /* '0x1B' */
+ case 0x30: { /* '0x30' */
return 0
}
default: {
@@ -845,6 +470,9 @@ func (e TransportSize) DataTransportSize() DataTransportSize {
func (e TransportSize) BaseType() TransportSize {
switch e {
+ case 0x00: { /* '0x00' */
+ return 0
+ }
case 0x01: { /* '0x01' */
return 0
}
@@ -855,73 +483,34 @@ func (e TransportSize) BaseType() TransportSize {
return 0
}
case 0x04: { /* '0x04' */
- return TransportSize_WORD
+ return 0
}
case 0x05: { /* '0x05' */
return 0
}
case 0x06: { /* '0x06' */
- return 0
+ return TransportSize_WORD
}
case 0x07: { /* '0x07' */
return TransportSize_INT
}
case 0x08: { /* '0x08' */
- return TransportSize_INT
+ return 0
}
case 0x09: { /* '0x09' */
- return TransportSize_INT
- }
- case 0x0A: { /* '0x0A' */
- return TransportSize_INT
+ return 0
}
case 0x0B: { /* '0x0B' */
- return TransportSize_INT
- }
- case 0x0C: { /* '0x0C' */
- return TransportSize_INT
- }
- case 0x0D: { /* '0x0D' */
- return TransportSize_INT
- }
- case 0x0E: { /* '0x0E' */
return 0
}
case 0x0F: { /* '0x0F' */
- return TransportSize_REAL
- }
- case 0x10: { /* '0x10' */
- return 0
- }
- case 0x11: { /* '0x11' */
- return 0
- }
- case 0x12: { /* '0x12' */
return 0
}
case 0x13: { /* '0x13' */
return 0
}
- case 0x14: { /* '0x14' */
- return 0
- }
- case 0x16: { /* '0x16' */
- return TransportSize_TIME
- }
- case 0x17: { /* '0x17' */
- return 0
- }
- case 0x18: { /* '0x18' */
- return 0
- }
- case 0x19: { /* '0x19' */
- return 0
- }
- case 0x1A: { /* '0x1A' */
- return 0
- }
- case 0x1B: { /* '0x1B' */
- return 0
+ case 0x30: { /* '0x30' */
+ return TransportSize_REAL
}
default: {
return 0
@@ -931,6 +520,9 @@ func (e TransportSize) BaseType() TransportSize {
func (e TransportSize) DataProtocolId() string {
switch e {
+ case 0x00: { /* '0x00' */
+ return "IEC61131_LWORD"
+ }
case 0x01: { /* '0x01' */
return "IEC61131_BOOL"
}
@@ -938,76 +530,37 @@ func (e TransportSize) DataProtocolId() string {
return "IEC61131_BYTE"
}
case 0x03: { /* '0x03' */
- return "IEC61131_WORD"
+ return "IEC61131_CHAR"
}
case 0x04: { /* '0x04' */
- return "IEC61131_DWORD"
+ return "IEC61131_WORD"
}
case 0x05: { /* '0x05' */
- return "IEC61131_LWORD"
+ return "IEC61131_INT"
}
case 0x06: { /* '0x06' */
- return "IEC61131_INT"
+ return "IEC61131_DWORD"
}
case 0x07: { /* '0x07' */
- return "IEC61131_UINT"
+ return "IEC61131_DINT"
}
case 0x08: { /* '0x08' */
- return "IEC61131_SINT"
+ return "IEC61131_REAL"
}
case 0x09: { /* '0x09' */
- return "IEC61131_USINT"
- }
- case 0x0A: { /* '0x0A' */
- return "IEC61131_DINT"
+ return "IEC61131_DATE"
}
case 0x0B: { /* '0x0B' */
- return "IEC61131_UDINT"
- }
- case 0x0C: { /* '0x0C' */
- return "IEC61131_LINT"
- }
- case 0x0D: { /* '0x0D' */
- return "IEC61131_ULINT"
- }
- case 0x0E: { /* '0x0E' */
- return "IEC61131_REAL"
+ return "IEC61131_TIME"
}
case 0x0F: { /* '0x0F' */
- return "IEC61131_LREAL"
- }
- case 0x10: { /* '0x10' */
- return "IEC61131_CHAR"
- }
- case 0x11: { /* '0x11' */
- return "IEC61131_WCHAR"
- }
- case 0x12: { /* '0x12' */
- return "IEC61131_STRING"
+ return "IEC61131_DATE_AND_TIME"
}
case 0x13: { /* '0x13' */
- return "IEC61131_WSTRING"
- }
- case 0x14: { /* '0x14' */
- return "IEC61131_TIME"
- }
- case 0x16: { /* '0x16' */
- return "IEC61131_LTIME"
- }
- case 0x17: { /* '0x17' */
- return "IEC61131_DATE"
- }
- case 0x18: { /* '0x18' */
- return "IEC61131_TIME_OF_DAY"
- }
- case 0x19: { /* '0x19' */
- return "IEC61131_TIME_OF_DAY"
- }
- case 0x1A: { /* '0x1A' */
- return "IEC61131_DATE_AND_TIME"
+ return "IEC61131_WCHAR"
}
- case 0x1B: { /* '0x1B' */
- return "IEC61131_DATE_AND_TIME"
+ case 0x30: { /* '0x30' */
+ return "IEC61131_LREAL"
}
default: {
return ""
@@ -1016,116 +569,68 @@ func (e TransportSize) DataProtocolId() string {
}
func TransportSizeByValue(value int8) TransportSize {
switch value {
+ case 0x00:
+ return TransportSize_LWORD
case 0x01:
return TransportSize_BOOL
case 0x02:
return TransportSize_BYTE
case 0x03:
- return TransportSize_WORD
+ return TransportSize_CHAR
case 0x04:
- return TransportSize_DWORD
+ return TransportSize_WORD
case 0x05:
- return TransportSize_LWORD
- case 0x06:
return TransportSize_INT
+ case 0x06:
+ return TransportSize_DWORD
case 0x07:
- return TransportSize_UINT
+ return TransportSize_DINT
case 0x08:
- return TransportSize_SINT
+ return TransportSize_REAL
case 0x09:
- return TransportSize_USINT
- case 0x0A:
- return TransportSize_DINT
+ return TransportSize_DATE
case 0x0B:
- return TransportSize_UDINT
- case 0x0C:
- return TransportSize_LINT
- case 0x0D:
- return TransportSize_ULINT
- case 0x0E:
- return TransportSize_REAL
- case 0x0F:
- return TransportSize_LREAL
- case 0x10:
- return TransportSize_CHAR
- case 0x11:
- return TransportSize_WCHAR
- case 0x12:
- return TransportSize_STRING
- case 0x13:
- return TransportSize_WSTRING
- case 0x14:
return TransportSize_TIME
- case 0x16:
- return TransportSize_LTIME
- case 0x17:
- return TransportSize_DATE
- case 0x18:
- return TransportSize_TIME_OF_DAY
- case 0x19:
- return TransportSize_TOD
- case 0x1A:
+ case 0x0F:
return TransportSize_DATE_AND_TIME
- case 0x1B:
- return TransportSize_DT
+ case 0x13:
+ return TransportSize_WCHAR
+ case 0x30:
+ return TransportSize_LREAL
}
return 0
}
func TransportSizeByName(value string) TransportSize {
switch value {
+ case "LWORD":
+ return TransportSize_LWORD
case "BOOL":
return TransportSize_BOOL
case "BYTE":
return TransportSize_BYTE
+ case "CHAR":
+ return TransportSize_CHAR
case "WORD":
return TransportSize_WORD
- case "DWORD":
- return TransportSize_DWORD
- case "LWORD":
- return TransportSize_LWORD
case "INT":
return TransportSize_INT
- case "UINT":
- return TransportSize_UINT
- case "SINT":
- return TransportSize_SINT
- case "USINT":
- return TransportSize_USINT
+ case "DWORD":
+ return TransportSize_DWORD
case "DINT":
return TransportSize_DINT
- case "UDINT":
- return TransportSize_UDINT
- case "LINT":
- return TransportSize_LINT
- case "ULINT":
- return TransportSize_ULINT
case "REAL":
return TransportSize_REAL
- case "LREAL":
- return TransportSize_LREAL
- case "CHAR":
- return TransportSize_CHAR
- case "WCHAR":
- return TransportSize_WCHAR
- case "STRING":
- return TransportSize_STRING
- case "WSTRING":
- return TransportSize_WSTRING
- case "TIME":
- return TransportSize_TIME
- case "LTIME":
- return TransportSize_LTIME
case "DATE":
return TransportSize_DATE
- case "TIME_OF_DAY":
- return TransportSize_TIME_OF_DAY
- case "TOD":
- return TransportSize_TOD
+ case "TIME":
+ return TransportSize_TIME
case "DATE_AND_TIME":
return TransportSize_DATE_AND_TIME
- case "DT":
- return TransportSize_DT
+ case "WCHAR":
+ return TransportSize_WCHAR
+ case "LREAL":
+ return TransportSize_LREAL
}
return 0
}
@@ -1163,58 +668,34 @@ func (e TransportSize) Serialize(io utils.WriteBuffer) error {
func (e TransportSize) String() string {
switch e {
+ case TransportSize_LWORD:
+ return "LWORD"
case TransportSize_BOOL:
return "BOOL"
case TransportSize_BYTE:
return "BYTE"
+ case TransportSize_CHAR:
+ return "CHAR"
case TransportSize_WORD:
return "WORD"
- case TransportSize_DWORD:
- return "DWORD"
- case TransportSize_LWORD:
- return "LWORD"
case TransportSize_INT:
return "INT"
- case TransportSize_UINT:
- return "UINT"
- case TransportSize_SINT:
- return "SINT"
- case TransportSize_USINT:
- return "USINT"
+ case TransportSize_DWORD:
+ return "DWORD"
case TransportSize_DINT:
return "DINT"
- case TransportSize_UDINT:
- return "UDINT"
- case TransportSize_LINT:
- return "LINT"
- case TransportSize_ULINT:
- return "ULINT"
case TransportSize_REAL:
return "REAL"
- case TransportSize_LREAL:
- return "LREAL"
- case TransportSize_CHAR:
- return "CHAR"
- case TransportSize_WCHAR:
- return "WCHAR"
- case TransportSize_STRING:
- return "STRING"
- case TransportSize_WSTRING:
- return "WSTRING"
- case TransportSize_TIME:
- return "TIME"
- case TransportSize_LTIME:
- return "LTIME"
case TransportSize_DATE:
return "DATE"
- case TransportSize_TIME_OF_DAY:
- return "TIME_OF_DAY"
- case TransportSize_TOD:
- return "TOD"
+ case TransportSize_TIME:
+ return "TIME"
case TransportSize_DATE_AND_TIME:
return "DATE_AND_TIME"
- case TransportSize_DT:
- return "DT"
+ case TransportSize_WCHAR:
+ return "WCHAR"
+ case TransportSize_LREAL:
+ return "LREAL"
}
return ""
}