This is an automated email from the ASF dual-hosted git repository.

chrisdutz pushed a change to branch refactor/spi3
in repository https://gitbox.apache.org/repos/asf/plc4x.git


    from a282533628 fix: Addressed the complex tag address issues. Now the full 
testsuite passes on a real device.
     add 86334e0420 feat: Complete rewrite of the S7 driver (merging together 
the s7 and s7-light)

No new revisions were added by this update.

Summary of changes:
 .../plc4x/language/c/CLanguageTemplateHelper.java  |   22 +-
 .../language/go/GoLanguageTemplateHelper.java      |   40 +-
 .../language/java/generators/BaseGenerator.java    |    8 +-
 .../language/java/JavaLanguageTemplateHelper.java  |   14 +-
 .../python/PythonLanguageTemplateHelper.java       |    9 +-
 .../parser-serializer-testcase-generator.xsl       |    4 +-
 plc4c/generated-sources/modbus/include/constants.h |    2 +
 plc4c/generated-sources/modbus/src/constants.c     |    8 +
 plc4c/generated-sources/modbus/src/data_item.c     |   12 +-
 .../modbus_pdu_read_file_record_response_item.c    |   13 +-
 .../modbus_pdu_write_file_record_request_item.c    |   13 +-
 .../modbus_pdu_write_file_record_response_item.c   |   13 +-
 plc4c/generated-sources/plc4x/src/plc4x_message.c  |    4 +-
 plc4c/generated-sources/plc4x/src/plc4x_tag.c      |    8 +-
 plc4c/generated-sources/plc4x/src/plc4x_value.c    |    8 +-
 .../s7/include/s7_payload_user_data_item.h         |   86 +-
 plc4c/generated-sources/s7/include/szl_sublist.h   |    9 +
 plc4c/generated-sources/s7/src/data_item.c         |   12 +-
 .../s7/src/s7_payload_user_data_item.c             |  275 +-
 plc4c/generated-sources/s7/src/szl_sublist.c       |   94 +-
 plc4c/spi/src/read_buffer.c                        |    2 +-
 plc4c/spi/src/write_buffer.c                       |    2 +-
 plc4c/spi/test/write_buffer_test.c                 |    2 +-
 .../protocols/ads/AdsDiscoverySerializerTest.xml   |  166 +-
 .../testing/protocols/ads/DriverTestsuite.xml      |   20 +-
 .../protocols/ads/ParserSerializerTestsuite.xml    |  190 +-
 .../protocols/bacnet/ParserSerializerTestsuite.xml |    4 +-
 .../protocols/df1/ParserSerializerTestsuite.xml    |    4 +-
 .../testing/protocols/eip/DriverTestsuite.xml      |    4 +-
 .../eip/ParserSerializerTestsuiteBigEndian.xml     |    4 +-
 .../eip/ParserSerializerTestsuiteLittleEndian.xml  |    4 +-
 .../firmata/ParserSerializerTestsuite.xml          |    4 +-
 .../knxnetip/ParserSerializerTestsuite.xml         |    4 +-
 .../protocols/logix/CompactLogixSimpleRead.xml     |    4 +-
 .../modbus/ascii/ParserSerializerTestsuite.xml     |    4 +-
 .../modbus/rtu/ParserSerializerTestsuite.xml       |    4 +-
 .../protocols/modbus/tcp/DriverTestsuite.xml       |   30 +-
 .../modbus/tcp/DriverTestsuiteOptimized.xml        |   26 +-
 .../ManualFactoryModbusTCPDriverTest-testsuite.xml |    0
 .../tcp/Modbus-all-datatypes-little-endian.xml     |   36 +-
 .../protocols/modbus/tcp/Modbus-all-datatypes.xml  |   36 +-
 .../modbus/tcp/ParserSerializerTestsuite.xml       |    4 +-
 .../testing/protocols/opcua/DriverTestsuite.xml    |    6 +-
 .../protocols/opcua/ParserSerializerTestsuite.xml  |    4 +-
 .../testing/protocols/s7/DriverTestsuite.xml       |    4 +-
 .../protocols/s7/ParserSerializerTestsuite.xml     |    4 +-
 .../ads/discovery/readwrite/model/AmsString.go     |    5 +-
 plc4go/protocols/ads/readwrite/ParserHelper.go     |   38 +-
 plc4go/protocols/ads/readwrite/XmlParserHelper.go  |   39 +-
 .../model/AdsAddDeviceNotificationRequest.go       |    2 +-
 .../model/AdsAddDeviceNotificationResponse.go      |    2 +-
 .../ads/readwrite/model/AdsAttributeEntry.go       |  378 +++
 .../ads/readwrite/model/AdsDataTypeAttributes.go   |  295 ++
 .../ads/readwrite/model/AdsDataTypeTableEntry.go   |  989 ++++++-
 .../protocols/ads/readwrite/model/AdsDatatypeId.go |  275 ++
 .../model/AdsDeleteDeviceNotificationRequest.go    |    2 +-
 .../model/AdsDeleteDeviceNotificationResponse.go   |    2 +-
 .../model/AdsDeviceNotificationRequest.go          |    2 +-
 .../model/AdsDeviceNotificationResponse.go         |    2 +-
 .../{AdsInvalidRequest.go => AdsErrorResponse.go}  |  138 +-
 .../ads/readwrite/model/AdsExtendedInfoEntry.go    |  655 +++++
 .../readwrite/model/AdsExtendedInfoEntryBigType.go |  271 ++
 .../ads/readwrite/model/AdsExtendedInfoEntryBit.go |  271 ++
 .../readwrite/model/AdsExtendedInfoEntryInt16.go   |  312 +++
 .../readwrite/model/AdsExtendedInfoEntryInt32.go   |  312 +++
 .../readwrite/model/AdsExtendedInfoEntryInt64.go   |  312 +++
 .../readwrite/model/AdsExtendedInfoEntryInt8.go    |  312 +++
 .../model/AdsExtendedInfoEntryMaxTypes.go          |  271 ++
 .../readwrite/model/AdsExtendedInfoEntryReal32.go  |  312 +++
 .../readwrite/model/AdsExtendedInfoEntryReal64.go  |  312 +++
 .../readwrite/model/AdsExtendedInfoEntryReal80.go  |  271 ++
 .../readwrite/model/AdsExtendedInfoEntryString.go  |  271 ++
 .../readwrite/model/AdsExtendedInfoEntryUint16.go  |  312 +++
 .../readwrite/model/AdsExtendedInfoEntryUint32.go  |  312 +++
 .../readwrite/model/AdsExtendedInfoEntryUint64.go  |  312 +++
 .../readwrite/model/AdsExtendedInfoEntryUint8.go   |  312 +++
 .../readwrite/model/AdsExtendedInfoEntryVoid.go    |  271 ++
 .../readwrite/model/AdsExtendedInfoEntryWstring.go |  271 ++
 .../ads/readwrite/model/AdsExtendedInfos.go        |  295 ++
 .../ads/readwrite/model/AdsInvalidRequest.go       |    2 +-
 .../ads/readwrite/model/AdsInvalidResponse.go      |    2 +-
 .../protocols/ads/readwrite/model/AdsMethodInfo.go |  757 ++++++
 .../ads/readwrite/model/AdsMethodInfos.go          |  295 ++
 .../ads/readwrite/model/AdsMethodParam.go          |  638 +++++
 .../readwrite/model/AdsReadDeviceInfoRequest.go    |    2 +-
 .../readwrite/model/AdsReadDeviceInfoResponse.go   |    2 +-
 .../ads/readwrite/model/AdsReadRequest.go          |    2 +-
 .../ads/readwrite/model/AdsReadResponse.go         |    2 +-
 .../ads/readwrite/model/AdsReadStateRequest.go     |    2 +-
 .../ads/readwrite/model/AdsReadStateResponse.go    |    2 +-
 .../ads/readwrite/model/AdsReadWriteRequest.go     |    2 +-
 .../ads/readwrite/model/AdsReadWriteResponse.go    |    2 +-
 plc4go/protocols/ads/readwrite/model/AdsString.go  |  278 ++
 .../ads/readwrite/model/AdsSymbolTableEntry.go     |  447 ++-
 .../protocols/ads/readwrite/model/AdsTableSizes.go |   74 +-
 .../ads/readwrite/model/AdsWriteControlRequest.go  |    2 +-
 .../ads/readwrite/model/AdsWriteControlResponse.go |    2 +-
 .../ads/readwrite/model/AdsWriteRequest.go         |    2 +-
 .../ads/readwrite/model/AdsWriteResponse.go        |    2 +-
 plc4go/protocols/ads/readwrite/model/AmsPacket.go  |   78 +-
 plc4go/protocols/ads/readwrite/model/DataItem.go   |   21 +-
 .../ads/readwrite/model/ReservedIndexGroups.go     | 1490 +++++++++-
 plc4go/protocols/ads/readwrite/model/ReturnCode.go |  678 ++---
 .../model/BACnetTagPayloadCharacterString.go       |    5 +-
 .../bacnetip/readwrite/model/BACnetVendorId.go     |   16 +
 .../knxnetip/readwrite/model/KnxDatapoint.go       |   42 +-
 .../knxnetip/readwrite/model/KnxManufacturer.go    |   40 +-
 .../knxnetip/readwrite/model/KnxProperty.go        |  138 +-
 .../protocols/modbus/readwrite/model/Constants.go  |    2 +
 .../protocols/modbus/readwrite/model/DataItem.go   |   16 +-
 .../protocols/opcua/readwrite/model/ChunkType.go   |    4 +-
 .../protocols/opcua/readwrite/model/MessageType.go |    4 +-
 .../opcua/readwrite/model/OpcuaDataType.go         |    4 +-
 .../opcua/readwrite/model/OpcuaIdentifierType.go   |    4 +-
 .../readwrite/model/OpcuaNodeIdServicesObject.go   | 2864 ++++++++++++++++++++
 plc4go/protocols/s7/readwrite/model/DataItem.go    |   16 +-
 .../s7/readwrite/model/S7PayloadUserDataItem.go    |  114 +-
 ...adUserDataItemCpuFunctionGetBlockInfoRequest.go |  380 +++
 ...dUserDataItemCpuFunctionGetBlockInfoResponse.go |  323 +++
 ...erDataItemCpuFunctionListBlocksOfTypeRequest.go |  321 +++
 ...rDataItemCpuFunctionListBlocksOfTypeResponse.go |  323 +++
 ...loadUserDataItemCpuFunctionListBlocksRequest.go |  288 ++
 ...oadUserDataItemCpuFunctionListBlocksResponse.go |  323 +++
 ...aItemCpuFunctionMsgSubscriptionAlarmResponse.go |   20 +-
 ...serDataItemCpuFunctionMsgSubscriptionRequest.go |   13 +-
 ...DataItemCyclicServicesSubscribeEmptyResponse.go |  280 ++
 plc4go/protocols/s7/readwrite/model/SzlSublist.go  |   72 +
 .../simulated/readwrite/model/DataItem.go          |   28 +-
 .../readwrite/model/SimulatedDataTypeSizes.go      |    5 +-
 .../plc4x/java/api/messages/PlcBrowseItem.java     |   17 +-
 .../apache/plc4x/java/ads/AdsTcpConnection.java    |    8 +-
 plc4j/drivers/all/pom.xml                          |   56 +-
 .../groovy/generate-config-documentation.groovy    |   16 +-
 .../java/bacnetip/readwrite/BACnetVendorId.java    |    2 +
 .../java/canopen/tag/CANOpenHeartbeatTag.java      |    2 +-
 .../plc4x/java/canopen/tag/CANOpenNMTTag.java      |    2 +-
 .../plc4x/java/canopen/tag/CANOpenPDOTag.java      |    4 +-
 .../plc4x/java/canopen/tag/CANOpenSDOTag.java      |    2 +-
 .../org/apache/plc4x/java/eip/base/tag/EipTag.java |    4 +-
 .../java/knxnetip/readwrite/KnxManufacturer.java   |    6 +-
 .../plc4x/java/modbus/base/tag/ModbusTag.java      |    2 +-
 .../opcua/readwrite/OpcuaNodeIdServicesObject.java |  718 ++++-
 .../org/apache/plc4x/java/plc4x/tag/Plc4xTag.java  |    2 +-
 plc4j/drivers/s7/pom.xml                           |  113 +-
 .../apache/plc4x/java/s7/readwrite/DataItem.java   |   16 +-
 .../java/s7/readwrite/S7PayloadUserDataItem.java   |   16 +-
 ...UserDataItemCpuFunctionGetBlockInfoRequest.java |  170 ++
 ...serDataItemCpuFunctionGetBlockInfoResponse.java |  123 +
 ...DataItemCpuFunctionListBlocksOfTypeRequest.java |  125 +
 ...ataItemCpuFunctionListBlocksOfTypeResponse.java |  123 +
 ...adUserDataItemCpuFunctionListBlocksRequest.java |   99 +
 ...dUserDataItemCpuFunctionListBlocksResponse.java |  123 +
 ...temCpuFunctionMsgSubscriptionAlarmResponse.java |   17 +-
 ...rDataItemCpuFunctionMsgSubscriptionRequest.java |   12 +-
 ...taItemCyclicServicesSubscribeEmptyResponse.java |   99 +
 .../apache/plc4x/java/s7/readwrite/SzlSublist.java |   18 +
 .../org/apache/plc4x/java/s7/S7CotpConnection.java | 1291 +++++++++
 .../apache/plc4x/java/s7/S7CotpMessageCodec.java   |  108 +
 .../java/org/apache/plc4x/java/s7/S7Driver.java    |  240 ++
 .../apache/plc4x/java/s7/S7HCotpConnection.java    |  474 ++++
 .../java/s7/configuration/S7Configuration.java     |  159 ++
 .../S7CotpTransportConfiguration.java              |  117 +
 .../plc4x/java/s7/context/S7DriverContext.java     |   79 +
 .../plc4x/java/s7/discovery/ProfinetChannel.java   |  223 ++
 .../plc4x/java/s7/discovery/S7PlcDiscoverer.java   |  308 +++
 .../apache/plc4x/java/s7/events/S7AlarmEvent.java  |  678 -----
 .../apache/plc4x/java/s7/events/S7CyclicEvent.java |  798 ------
 .../plc4x/java/s7/events/S7CyclicValueEvent.java   |   23 -
 .../org/apache/plc4x/java/s7/events/S7Event.java   |   51 -
 .../apache/plc4x/java/s7/events/S7EventBase.java   |   59 -
 .../apache/plc4x/java/s7/events/S7ModeEvent.java   |  451 ---
 .../apache/plc4x/java/s7/events/S7SysEvent.java    |  458 ----
 .../apache/plc4x/java/s7/events/S7UserEvent.java   |   38 -
 .../java/s7/optimizer/S7BlockReadOptimizer.java    |  162 ++
 .../plc4x/java/s7/optimizer/S7Optimizer.java       |  261 ++
 .../plc4x/java/s7/optimizer/S7ReadChunk.java       |   62 +
 .../plc4x/java/s7/optimizer/S7WriteChunk.java}     |   16 +-
 .../apache/plc4x/java/s7/readwrite/S7Driver.java   |  173 --
 .../readwrite/configuration/S7Configuration.java   |  305 ---
 .../configuration/S7TcpTransportConfiguration.java |   32 -
 .../java/s7/readwrite/context/S7DriverContext.java |  213 --
 .../s7/readwrite/discovery/ProfinetChannel.java    |  273 --
 .../s7/readwrite/discovery/S7PlcDiscoverer.java    |  318 ---
 .../java/s7/readwrite/optimizer/S7Optimizer.java   |  425 ---
 .../readwrite/protocol/S7HGeneratedDriverBase.java |  220 --
 .../plc4x/java/s7/readwrite/protocol/S7HMux.java   |   34 -
 .../java/s7/readwrite/protocol/S7HMuxImpl.java     |  368 ---
 .../s7/readwrite/protocol/S7HPlcConnection.java    |  467 ----
 .../protocol/S7HSingleProtocolStackConfigurer.java |  214 --
 .../readwrite/protocol/S7ProtocolEventLogic.java   |  244 --
 .../s7/readwrite/protocol/S7ProtocolLogic.java     | 2500 -----------------
 .../plc4x/java/s7/readwrite/tag/S7AckTag.java      |   77 -
 .../plc4x/java/s7/readwrite/tag/S7ClkTag.java      |   97 -
 .../java/s7/readwrite/tag/S7SubscriptionTag.java   |  342 ---
 .../plc4x/java/s7/readwrite/tag/S7SzlTag.java      |   87 -
 .../s7/readwrite/types/S7SubscriptionType.java     |   29 -
 .../readwrite/utils/S7PlcSubscriptionHandle.java   |   50 -
 .../readwrite/utils/S7PlcSubscriptionRequest.java  |  429 ---
 .../java/s7/readwrite/utils/StaticHelper.java      | 2782 ++-----------------
 .../org/apache/plc4x/java/s7/tag/S7AlarmTag.java   |   97 +
 .../s7/{readwrite => }/tag/S7PlcTagHandler.java    |   27 +-
 .../tag/S7StringFixedLengthTag.java                |   34 +-
 .../{readwrite => }/tag/S7StringVarLengthTag.java  |   32 +-
 .../plc4x/java/s7/{readwrite => }/tag/S7Tag.java   |   55 +-
 .../plc4x/java/s7/userdata/S7AlarmQueryHandle.java |   68 +
 .../s7/userdata/S7AlarmSubscriptionHandle.java     |   58 +
 .../s7/userdata/S7AlarmSubscriptionService.java    |  378 +++
 .../plc4x/java/s7/userdata/S7BrowseService.java    |  234 ++
 .../s7/userdata/S7CyclicSubscriptionHandle.java    |   68 +
 .../s7/userdata/S7CyclicSubscriptionService.java   |  291 ++
 .../plc4x/java/s7/userdata/S7SzlService.java       |  291 ++
 .../java/s7/userdata/S7UserDataPushDispatcher.java |   90 +
 .../plc4x/java/s7/utils/S7DiagnosticEventId.java   |  679 -----
 .../plc4x/java/s7/utils/S7ParamErrorCode.java      |  271 --
 .../s7/{readwrite => }/utils/S7TsapIdEncoder.java  |   15 +-
 .../java/s7light/readwrite/S7LightDriver.java      |  174 --
 .../readwrite/configuration/S7Configuration.java   |  234 --
 .../s7light/readwrite/context/S7DriverContext.java |  177 --
 .../readwrite/optimizer/S7BlockReadOptimizer.java  |  515 ----
 .../s7light/readwrite/optimizer/S7Optimizer.java   |  413 ---
 .../readwrite/protocol/S7ProtocolLogic.java        | 1106 --------
 .../s7light/readwrite/tag/S7PlcTagHandler.java     |   46 -
 .../services/org.apache.plc4x.java.api.PlcDriver   |    3 +-
 .../java/s7/readwrite/utils/StaticHelper.java      |  323 ---
 .../s7discovery/readwrite/utils/StaticHelper.java  |   28 -
 .../s7/src/test/java/BenchmarkGeneratedS7.java     |   70 -
 plc4j/drivers/s7/src/test/java/S7IoTest.java       |  387 ---
 .../org/apache/plc4x/java/s7/S7DriverTest.java     |  108 +
 .../plc4x/java/s7/S7HCotpConnectionTest.java       |  241 ++
 .../java/s7/configuration/S7ConfigurationTest.java |   84 +
 .../S7CotpTransportConfigurationTest.java          |  103 +
 .../plc4x/java/s7/context/S7DriverContextTest.java |   90 +
 .../java/s7/manual/ManualFactoryS71200Browse.java  |   84 +
 .../ManualFactoryS71200DriverTest.java}            |   19 +-
 .../plc4x/java/s7/manual/ManualS7Discovery.java    |   56 +
 .../java/s7/manual/ManualWallS71500HFailover.java  |   96 +
 .../s7/manual/ManualWallS71500NewFWBrowse.java     |   84 +
 .../s7/manual/ManualWallS71500OldFWBrowse.java     |   84 +
 .../s7/manual/ManualWallS7300AlarmSubscribe.java   |  103 +
 .../java/s7/manual/ManualWallS7300Browse.java      |   84 +
 .../s7/manual/ManualWallS7300CyclicSubscribe.java  |   76 +
 .../java/s7/manual/ManualWallS7300DriverTest.java  |  126 +
 .../s7/optimizer/S7BlockReadOptimizerTest.java     |  180 ++
 .../plc4x/java/s7/optimizer/S7OptimizerTest.java   |  129 +
 .../plc4x/java/s7/readwrite/DatatypesTest.java     |  104 -
 .../java/s7/readwrite/ManualS71200DriverTest.java  |  119 -
 .../java/s7/readwrite/ManualS71200DriverTest2.java |   58 -
 .../java/s7/readwrite/ManualS71200DriverTest3.java |   51 -
 .../java/s7/readwrite/ManualS71500DriverTest.java  |   70 -
 .../java/s7/readwrite/ManualS7CounterTest.java     |  108 -
 .../plc4x/java/s7/readwrite/ManualS7Discovery.java |   31 -
 .../apache/plc4x/java/s7/readwrite/S7DriverIT.java |   33 -
 .../java/s7/readwrite/S7ParserSerializerTest.java  |   38 -
 .../readwrite/tag/S7StringFixedLengthTagTest.java  |   44 -
 .../plc4x/java/s7/readwrite/tag/S7TagTest.java     |   39 -
 .../apache/plc4x/java/s7/tag/S7AlarmTagTest.java   |   75 +
 .../apache/plc4x/java/s7/tag/S7StringTagTest.java  |  125 +
 .../plc4x/java/s7/tag/S7TagSerializeTest.java      |  133 +
 .../org/apache/plc4x/java/s7/tag/S7TagTest.java    |  168 ++
 .../userdata/S7AlarmSubscriptionServiceTest.java   |  255 ++
 .../java/s7/userdata/S7BrowseConnectionTest.java   |   70 +
 .../java/s7/userdata/S7BrowseServiceTest.java      |  138 +
 .../userdata/S7CyclicSubscriptionServiceTest.java  |  229 ++
 .../java/s7/userdata/S7SubscriptionHandleTest.java |  133 +
 .../plc4x/java/s7/userdata/S7SzlServiceTest.java   |  171 ++
 .../s7/userdata/S7UserDataPushDispatcherTest.java  |   89 +
 .../drivers/s7/src/test/resources/logback-test.xml |   12 +
 .../plc4x/java/simulated/readwrite/DataItem.java   |   24 +-
 .../bytebased/encoding/EncodingManager.java        |   12 +-
 .../apache/plc4x/java/spi/drivers/DriverBase.java  |  141 +-
 .../spi/drivers/messages/DefaultPlcBrowseItem.java |   16 +-
 .../drivers/messages/metadata/DefaultOption.java   |   75 +
 .../messages/metadata/DefaultOptionMetadata.java}  |   25 +-
 .../org/apache/plc4x/java/spi/values/PlcCHAR.java  |    2 +-
 .../org/apache/plc4x/java/spi/values/PlcDATE.java  |    2 +-
 .../plc4x/java/spi/values/PlcDATE_AND_LTIME.java   |    2 +-
 .../plc4x/java/spi/values/PlcDATE_AND_TIME.java    |    2 +-
 .../apache/plc4x/java/spi/values/PlcIECValue.java  |    2 +-
 .../org/apache/plc4x/java/spi/values/PlcLDATE.java |    2 +-
 .../plc4x/java/spi/values/PlcLDATE_AND_TIME.java   |    2 +-
 .../org/apache/plc4x/java/spi/values/PlcLTIME.java |    2 +-
 .../plc4x/java/spi/values/PlcLTIME_OF_DAY.java     |    2 +-
 .../apache/plc4x/java/spi/values/PlcSTRING.java    |    2 +-
 .../plc4x/java/spi/values/PlcTIME_OF_DAY.java      |    2 +-
 .../org/apache/plc4x/java/spi/values/PlcWCHAR.java |    2 +-
 .../apache/plc4x/java/spi/values/PlcWSTRING.java   |    2 +-
 .../plc4x/simulator/server/s7/S7ServerModule.java  |    2 +-
 .../knxnetip/ParserSerializerTestsuite.xml         |    4 +-
 .../knxnetip/readwrite/model/KnxDatapoint.cs       |   24 +-
 .../knxnetip/readwrite/model/KnxManufacturer.cs    |   27 +-
 .../knxnetip/readwrite/model/KnxProperty.cs        |  138 +-
 .../plc4py/protocols/modbus/readwrite/Constants.py |    2 +
 .../plc4py/protocols/modbus/readwrite/DataItem.py  |   16 +-
 .../protocols/simulated/readwrite/DataItem.py      |  189 +-
 .../plc4py/utils/generated/driver_testsuite.py     |    4 +-
 .../utils/generated/parser_serializer_testsuite.py |    4 +-
 .../protocols/bacnetip/bacnet-vendorids.mspec      |    1 +
 .../df1/src/main/resources/protocols/df1/df1.mspec |    2 +-
 .../protocols/knxnetip/knx-master-data.mspec       |    5 +-
 .../src/main/resources/protocols/mqtt/mqtt.mspec   |    2 +-
 .../generated/protocols/opcua/opc-services.mspec   |  358 +++
 .../s7/src/main/resources/protocols/s7/s7.mspec    |   73 +-
 .../resources/protocols/simulated/simulated.mspec  |   12 +-
 .../main/resources/protocols/can/socketcan.mspec   |    2 +-
 .../main/resources/protocols/umas/v0/umas.mspec    |    4 +-
 website/asciidoc/modules/users/nav.adoc            |    1 -
 website/asciidoc/modules/users/partials/ads.adoc   |   16 +-
 .../modules/users/partials/modbus-ascii.adoc       |  114 +-
 .../modules/users/partials/modbus-rtu.adoc         |  115 +-
 .../modules/users/partials/modbus-tcp.adoc         |   65 +-
 .../asciidoc/modules/users/partials/s7-light.adoc  |   74 -
 website/asciidoc/modules/users/partials/s7.adoc    |   75 +-
 312 files changed, 30230 insertions(+), 19043 deletions(-)
 copy {protocols/modbus/src/test/resources => 
plc4go/assets/testing}/protocols/modbus/tcp/ManualFactoryModbusTCPDriverTest-testsuite.xml
 (100%)
 create mode 100644 plc4go/protocols/ads/readwrite/model/AdsAttributeEntry.go
 create mode 100644 
plc4go/protocols/ads/readwrite/model/AdsDataTypeAttributes.go
 create mode 100644 plc4go/protocols/ads/readwrite/model/AdsDatatypeId.go
 copy plc4go/protocols/ads/readwrite/model/{AdsInvalidRequest.go => 
AdsErrorResponse.go} (50%)
 create mode 100644 plc4go/protocols/ads/readwrite/model/AdsExtendedInfoEntry.go
 create mode 100644 
plc4go/protocols/ads/readwrite/model/AdsExtendedInfoEntryBigType.go
 create mode 100644 
plc4go/protocols/ads/readwrite/model/AdsExtendedInfoEntryBit.go
 create mode 100644 
plc4go/protocols/ads/readwrite/model/AdsExtendedInfoEntryInt16.go
 create mode 100644 
plc4go/protocols/ads/readwrite/model/AdsExtendedInfoEntryInt32.go
 create mode 100644 
plc4go/protocols/ads/readwrite/model/AdsExtendedInfoEntryInt64.go
 create mode 100644 
plc4go/protocols/ads/readwrite/model/AdsExtendedInfoEntryInt8.go
 create mode 100644 
plc4go/protocols/ads/readwrite/model/AdsExtendedInfoEntryMaxTypes.go
 create mode 100644 
plc4go/protocols/ads/readwrite/model/AdsExtendedInfoEntryReal32.go
 create mode 100644 
plc4go/protocols/ads/readwrite/model/AdsExtendedInfoEntryReal64.go
 create mode 100644 
plc4go/protocols/ads/readwrite/model/AdsExtendedInfoEntryReal80.go
 create mode 100644 
plc4go/protocols/ads/readwrite/model/AdsExtendedInfoEntryString.go
 create mode 100644 
plc4go/protocols/ads/readwrite/model/AdsExtendedInfoEntryUint16.go
 create mode 100644 
plc4go/protocols/ads/readwrite/model/AdsExtendedInfoEntryUint32.go
 create mode 100644 
plc4go/protocols/ads/readwrite/model/AdsExtendedInfoEntryUint64.go
 create mode 100644 
plc4go/protocols/ads/readwrite/model/AdsExtendedInfoEntryUint8.go
 create mode 100644 
plc4go/protocols/ads/readwrite/model/AdsExtendedInfoEntryVoid.go
 create mode 100644 
plc4go/protocols/ads/readwrite/model/AdsExtendedInfoEntryWstring.go
 create mode 100644 plc4go/protocols/ads/readwrite/model/AdsExtendedInfos.go
 create mode 100644 plc4go/protocols/ads/readwrite/model/AdsMethodInfo.go
 create mode 100644 plc4go/protocols/ads/readwrite/model/AdsMethodInfos.go
 create mode 100644 plc4go/protocols/ads/readwrite/model/AdsMethodParam.go
 create mode 100644 plc4go/protocols/ads/readwrite/model/AdsString.go
 create mode 100644 
plc4go/protocols/s7/readwrite/model/S7PayloadUserDataItemCpuFunctionGetBlockInfoRequest.go
 create mode 100644 
plc4go/protocols/s7/readwrite/model/S7PayloadUserDataItemCpuFunctionGetBlockInfoResponse.go
 create mode 100644 
plc4go/protocols/s7/readwrite/model/S7PayloadUserDataItemCpuFunctionListBlocksOfTypeRequest.go
 create mode 100644 
plc4go/protocols/s7/readwrite/model/S7PayloadUserDataItemCpuFunctionListBlocksOfTypeResponse.go
 create mode 100644 
plc4go/protocols/s7/readwrite/model/S7PayloadUserDataItemCpuFunctionListBlocksRequest.go
 create mode 100644 
plc4go/protocols/s7/readwrite/model/S7PayloadUserDataItemCpuFunctionListBlocksResponse.go
 create mode 100644 
plc4go/protocols/s7/readwrite/model/S7PayloadUserDataItemCyclicServicesSubscribeEmptyResponse.go
 create mode 100644 
plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/S7PayloadUserDataItemCpuFunctionGetBlockInfoRequest.java
 create mode 100644 
plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/S7PayloadUserDataItemCpuFunctionGetBlockInfoResponse.java
 create mode 100644 
plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/S7PayloadUserDataItemCpuFunctionListBlocksOfTypeRequest.java
 create mode 100644 
plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/S7PayloadUserDataItemCpuFunctionListBlocksOfTypeResponse.java
 create mode 100644 
plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/S7PayloadUserDataItemCpuFunctionListBlocksRequest.java
 create mode 100644 
plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/S7PayloadUserDataItemCpuFunctionListBlocksResponse.java
 create mode 100644 
plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/S7PayloadUserDataItemCyclicServicesSubscribeEmptyResponse.java
 create mode 100644 
plc4j/drivers/s7/src/main/java/org/apache/plc4x/java/s7/S7CotpConnection.java
 create mode 100644 
plc4j/drivers/s7/src/main/java/org/apache/plc4x/java/s7/S7CotpMessageCodec.java
 create mode 100644 
plc4j/drivers/s7/src/main/java/org/apache/plc4x/java/s7/S7Driver.java
 create mode 100644 
plc4j/drivers/s7/src/main/java/org/apache/plc4x/java/s7/S7HCotpConnection.java
 create mode 100644 
plc4j/drivers/s7/src/main/java/org/apache/plc4x/java/s7/configuration/S7Configuration.java
 create mode 100644 
plc4j/drivers/s7/src/main/java/org/apache/plc4x/java/s7/configuration/S7CotpTransportConfiguration.java
 create mode 100644 
plc4j/drivers/s7/src/main/java/org/apache/plc4x/java/s7/context/S7DriverContext.java
 create mode 100644 
plc4j/drivers/s7/src/main/java/org/apache/plc4x/java/s7/discovery/ProfinetChannel.java
 create mode 100644 
plc4j/drivers/s7/src/main/java/org/apache/plc4x/java/s7/discovery/S7PlcDiscoverer.java
 delete mode 100644 
plc4j/drivers/s7/src/main/java/org/apache/plc4x/java/s7/events/S7AlarmEvent.java
 delete mode 100644 
plc4j/drivers/s7/src/main/java/org/apache/plc4x/java/s7/events/S7CyclicEvent.java
 delete mode 100644 
plc4j/drivers/s7/src/main/java/org/apache/plc4x/java/s7/events/S7CyclicValueEvent.java
 delete mode 100644 
plc4j/drivers/s7/src/main/java/org/apache/plc4x/java/s7/events/S7Event.java
 delete mode 100644 
plc4j/drivers/s7/src/main/java/org/apache/plc4x/java/s7/events/S7EventBase.java
 delete mode 100644 
plc4j/drivers/s7/src/main/java/org/apache/plc4x/java/s7/events/S7ModeEvent.java
 delete mode 100644 
plc4j/drivers/s7/src/main/java/org/apache/plc4x/java/s7/events/S7SysEvent.java
 delete mode 100644 
plc4j/drivers/s7/src/main/java/org/apache/plc4x/java/s7/events/S7UserEvent.java
 create mode 100644 
plc4j/drivers/s7/src/main/java/org/apache/plc4x/java/s7/optimizer/S7BlockReadOptimizer.java
 create mode 100644 
plc4j/drivers/s7/src/main/java/org/apache/plc4x/java/s7/optimizer/S7Optimizer.java
 create mode 100644 
plc4j/drivers/s7/src/main/java/org/apache/plc4x/java/s7/optimizer/S7ReadChunk.java
 rename 
plc4j/drivers/s7/src/{test/java/org/apache/plc4x/java/s7/readwrite/issues/PLC4X272Test.java
 => main/java/org/apache/plc4x/java/s7/optimizer/S7WriteChunk.java} (73%)
 delete mode 100644 
plc4j/drivers/s7/src/main/java/org/apache/plc4x/java/s7/readwrite/S7Driver.java
 delete mode 100644 
plc4j/drivers/s7/src/main/java/org/apache/plc4x/java/s7/readwrite/configuration/S7Configuration.java
 delete mode 100644 
plc4j/drivers/s7/src/main/java/org/apache/plc4x/java/s7/readwrite/configuration/S7TcpTransportConfiguration.java
 delete mode 100644 
plc4j/drivers/s7/src/main/java/org/apache/plc4x/java/s7/readwrite/context/S7DriverContext.java
 delete mode 100644 
plc4j/drivers/s7/src/main/java/org/apache/plc4x/java/s7/readwrite/discovery/ProfinetChannel.java
 delete mode 100644 
plc4j/drivers/s7/src/main/java/org/apache/plc4x/java/s7/readwrite/discovery/S7PlcDiscoverer.java
 delete mode 100644 
plc4j/drivers/s7/src/main/java/org/apache/plc4x/java/s7/readwrite/optimizer/S7Optimizer.java
 delete mode 100644 
plc4j/drivers/s7/src/main/java/org/apache/plc4x/java/s7/readwrite/protocol/S7HGeneratedDriverBase.java
 delete mode 100644 
plc4j/drivers/s7/src/main/java/org/apache/plc4x/java/s7/readwrite/protocol/S7HMux.java
 delete mode 100644 
plc4j/drivers/s7/src/main/java/org/apache/plc4x/java/s7/readwrite/protocol/S7HMuxImpl.java
 delete mode 100644 
plc4j/drivers/s7/src/main/java/org/apache/plc4x/java/s7/readwrite/protocol/S7HPlcConnection.java
 delete mode 100644 
plc4j/drivers/s7/src/main/java/org/apache/plc4x/java/s7/readwrite/protocol/S7HSingleProtocolStackConfigurer.java
 delete mode 100644 
plc4j/drivers/s7/src/main/java/org/apache/plc4x/java/s7/readwrite/protocol/S7ProtocolEventLogic.java
 delete mode 100644 
plc4j/drivers/s7/src/main/java/org/apache/plc4x/java/s7/readwrite/protocol/S7ProtocolLogic.java
 delete mode 100644 
plc4j/drivers/s7/src/main/java/org/apache/plc4x/java/s7/readwrite/tag/S7AckTag.java
 delete mode 100644 
plc4j/drivers/s7/src/main/java/org/apache/plc4x/java/s7/readwrite/tag/S7ClkTag.java
 delete mode 100644 
plc4j/drivers/s7/src/main/java/org/apache/plc4x/java/s7/readwrite/tag/S7SubscriptionTag.java
 delete mode 100644 
plc4j/drivers/s7/src/main/java/org/apache/plc4x/java/s7/readwrite/tag/S7SzlTag.java
 delete mode 100644 
plc4j/drivers/s7/src/main/java/org/apache/plc4x/java/s7/readwrite/types/S7SubscriptionType.java
 delete mode 100644 
plc4j/drivers/s7/src/main/java/org/apache/plc4x/java/s7/readwrite/utils/S7PlcSubscriptionHandle.java
 delete mode 100644 
plc4j/drivers/s7/src/main/java/org/apache/plc4x/java/s7/readwrite/utils/S7PlcSubscriptionRequest.java
 create mode 100644 
plc4j/drivers/s7/src/main/java/org/apache/plc4x/java/s7/tag/S7AlarmTag.java
 rename plc4j/drivers/s7/src/main/java/org/apache/plc4x/java/s7/{readwrite => 
}/tag/S7PlcTagHandler.java (69%)
 rename plc4j/drivers/s7/src/main/java/org/apache/plc4x/java/s7/{readwrite => 
}/tag/S7StringFixedLengthTag.java (84%)
 rename plc4j/drivers/s7/src/main/java/org/apache/plc4x/java/s7/{readwrite => 
}/tag/S7StringVarLengthTag.java (82%)
 rename plc4j/drivers/s7/src/main/java/org/apache/plc4x/java/s7/{readwrite => 
}/tag/S7Tag.java (89%)
 create mode 100644 
plc4j/drivers/s7/src/main/java/org/apache/plc4x/java/s7/userdata/S7AlarmQueryHandle.java
 create mode 100644 
plc4j/drivers/s7/src/main/java/org/apache/plc4x/java/s7/userdata/S7AlarmSubscriptionHandle.java
 create mode 100644 
plc4j/drivers/s7/src/main/java/org/apache/plc4x/java/s7/userdata/S7AlarmSubscriptionService.java
 create mode 100644 
plc4j/drivers/s7/src/main/java/org/apache/plc4x/java/s7/userdata/S7BrowseService.java
 create mode 100644 
plc4j/drivers/s7/src/main/java/org/apache/plc4x/java/s7/userdata/S7CyclicSubscriptionHandle.java
 create mode 100644 
plc4j/drivers/s7/src/main/java/org/apache/plc4x/java/s7/userdata/S7CyclicSubscriptionService.java
 create mode 100644 
plc4j/drivers/s7/src/main/java/org/apache/plc4x/java/s7/userdata/S7SzlService.java
 create mode 100644 
plc4j/drivers/s7/src/main/java/org/apache/plc4x/java/s7/userdata/S7UserDataPushDispatcher.java
 delete mode 100644 
plc4j/drivers/s7/src/main/java/org/apache/plc4x/java/s7/utils/S7DiagnosticEventId.java
 delete mode 100644 
plc4j/drivers/s7/src/main/java/org/apache/plc4x/java/s7/utils/S7ParamErrorCode.java
 rename plc4j/drivers/s7/src/main/java/org/apache/plc4x/java/s7/{readwrite => 
}/utils/S7TsapIdEncoder.java (75%)
 delete mode 100644 
plc4j/drivers/s7/src/main/java/org/apache/plc4x/java/s7light/readwrite/S7LightDriver.java
 delete mode 100644 
plc4j/drivers/s7/src/main/java/org/apache/plc4x/java/s7light/readwrite/configuration/S7Configuration.java
 delete mode 100644 
plc4j/drivers/s7/src/main/java/org/apache/plc4x/java/s7light/readwrite/context/S7DriverContext.java
 delete mode 100644 
plc4j/drivers/s7/src/main/java/org/apache/plc4x/java/s7light/readwrite/optimizer/S7BlockReadOptimizer.java
 delete mode 100644 
plc4j/drivers/s7/src/main/java/org/apache/plc4x/java/s7light/readwrite/optimizer/S7Optimizer.java
 delete mode 100644 
plc4j/drivers/s7/src/main/java/org/apache/plc4x/java/s7light/readwrite/protocol/S7ProtocolLogic.java
 delete mode 100644 
plc4j/drivers/s7/src/main/java/org/apache/plc4x/java/s7light/readwrite/tag/S7PlcTagHandler.java
 delete mode 100644 
plc4j/drivers/s7/src/main/temp/org/apache/plc4x/java/s7/readwrite/utils/StaticHelper.java
 delete mode 100644 
plc4j/drivers/s7/src/main/temp/org/apache/plc4x/java/s7discovery/readwrite/utils/StaticHelper.java
 delete mode 100644 plc4j/drivers/s7/src/test/java/BenchmarkGeneratedS7.java
 delete mode 100644 plc4j/drivers/s7/src/test/java/S7IoTest.java
 create mode 100644 
plc4j/drivers/s7/src/test/java/org/apache/plc4x/java/s7/S7DriverTest.java
 create mode 100644 
plc4j/drivers/s7/src/test/java/org/apache/plc4x/java/s7/S7HCotpConnectionTest.java
 create mode 100644 
plc4j/drivers/s7/src/test/java/org/apache/plc4x/java/s7/configuration/S7ConfigurationTest.java
 create mode 100644 
plc4j/drivers/s7/src/test/java/org/apache/plc4x/java/s7/configuration/S7CotpTransportConfigurationTest.java
 create mode 100644 
plc4j/drivers/s7/src/test/java/org/apache/plc4x/java/s7/context/S7DriverContextTest.java
 create mode 100644 
plc4j/drivers/s7/src/test/java/org/apache/plc4x/java/s7/manual/ManualFactoryS71200Browse.java
 rename 
plc4j/drivers/s7/src/test/java/org/apache/plc4x/java/s7/{readwrite/ManualS71200DriverWithBlockOptimizerTest.java
 => manual/ManualFactoryS71200DriverTest.java} (91%)
 create mode 100644 
plc4j/drivers/s7/src/test/java/org/apache/plc4x/java/s7/manual/ManualS7Discovery.java
 create mode 100644 
plc4j/drivers/s7/src/test/java/org/apache/plc4x/java/s7/manual/ManualWallS71500HFailover.java
 create mode 100644 
plc4j/drivers/s7/src/test/java/org/apache/plc4x/java/s7/manual/ManualWallS71500NewFWBrowse.java
 create mode 100644 
plc4j/drivers/s7/src/test/java/org/apache/plc4x/java/s7/manual/ManualWallS71500OldFWBrowse.java
 create mode 100644 
plc4j/drivers/s7/src/test/java/org/apache/plc4x/java/s7/manual/ManualWallS7300AlarmSubscribe.java
 create mode 100644 
plc4j/drivers/s7/src/test/java/org/apache/plc4x/java/s7/manual/ManualWallS7300Browse.java
 create mode 100644 
plc4j/drivers/s7/src/test/java/org/apache/plc4x/java/s7/manual/ManualWallS7300CyclicSubscribe.java
 create mode 100644 
plc4j/drivers/s7/src/test/java/org/apache/plc4x/java/s7/manual/ManualWallS7300DriverTest.java
 create mode 100644 
plc4j/drivers/s7/src/test/java/org/apache/plc4x/java/s7/optimizer/S7BlockReadOptimizerTest.java
 create mode 100644 
plc4j/drivers/s7/src/test/java/org/apache/plc4x/java/s7/optimizer/S7OptimizerTest.java
 delete mode 100644 
plc4j/drivers/s7/src/test/java/org/apache/plc4x/java/s7/readwrite/DatatypesTest.java
 delete mode 100644 
plc4j/drivers/s7/src/test/java/org/apache/plc4x/java/s7/readwrite/ManualS71200DriverTest.java
 delete mode 100644 
plc4j/drivers/s7/src/test/java/org/apache/plc4x/java/s7/readwrite/ManualS71200DriverTest2.java
 delete mode 100644 
plc4j/drivers/s7/src/test/java/org/apache/plc4x/java/s7/readwrite/ManualS71200DriverTest3.java
 delete mode 100644 
plc4j/drivers/s7/src/test/java/org/apache/plc4x/java/s7/readwrite/ManualS71500DriverTest.java
 delete mode 100644 
plc4j/drivers/s7/src/test/java/org/apache/plc4x/java/s7/readwrite/ManualS7CounterTest.java
 delete mode 100644 
plc4j/drivers/s7/src/test/java/org/apache/plc4x/java/s7/readwrite/ManualS7Discovery.java
 delete mode 100644 
plc4j/drivers/s7/src/test/java/org/apache/plc4x/java/s7/readwrite/S7DriverIT.java
 delete mode 100644 
plc4j/drivers/s7/src/test/java/org/apache/plc4x/java/s7/readwrite/S7ParserSerializerTest.java
 delete mode 100644 
plc4j/drivers/s7/src/test/java/org/apache/plc4x/java/s7/readwrite/tag/S7StringFixedLengthTagTest.java
 delete mode 100644 
plc4j/drivers/s7/src/test/java/org/apache/plc4x/java/s7/readwrite/tag/S7TagTest.java
 create mode 100644 
plc4j/drivers/s7/src/test/java/org/apache/plc4x/java/s7/tag/S7AlarmTagTest.java
 create mode 100644 
plc4j/drivers/s7/src/test/java/org/apache/plc4x/java/s7/tag/S7StringTagTest.java
 create mode 100644 
plc4j/drivers/s7/src/test/java/org/apache/plc4x/java/s7/tag/S7TagSerializeTest.java
 create mode 100644 
plc4j/drivers/s7/src/test/java/org/apache/plc4x/java/s7/tag/S7TagTest.java
 create mode 100644 
plc4j/drivers/s7/src/test/java/org/apache/plc4x/java/s7/userdata/S7AlarmSubscriptionServiceTest.java
 create mode 100644 
plc4j/drivers/s7/src/test/java/org/apache/plc4x/java/s7/userdata/S7BrowseConnectionTest.java
 create mode 100644 
plc4j/drivers/s7/src/test/java/org/apache/plc4x/java/s7/userdata/S7BrowseServiceTest.java
 create mode 100644 
plc4j/drivers/s7/src/test/java/org/apache/plc4x/java/s7/userdata/S7CyclicSubscriptionServiceTest.java
 create mode 100644 
plc4j/drivers/s7/src/test/java/org/apache/plc4x/java/s7/userdata/S7SubscriptionHandleTest.java
 create mode 100644 
plc4j/drivers/s7/src/test/java/org/apache/plc4x/java/s7/userdata/S7SzlServiceTest.java
 create mode 100644 
plc4j/drivers/s7/src/test/java/org/apache/plc4x/java/s7/userdata/S7UserDataPushDispatcherTest.java
 create mode 100644 
plc4j/spi/drivers/src/main/java/org/apache/plc4x/java/spi/drivers/messages/metadata/DefaultOption.java
 rename 
plc4j/{drivers/s7/src/main/java/org/apache/plc4x/java/s7light/readwrite/configuration/S7TcpTransportConfiguration.java
 => 
spi/drivers/src/main/java/org/apache/plc4x/java/spi/drivers/messages/metadata/DefaultOptionMetadata.java}
 (56%)
 delete mode 100644 website/asciidoc/modules/users/partials/s7-light.adoc


Reply via email to