You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@plc4x.apache.org by ld...@apache.org on 2021/09/04 22:18:43 UTC
[plc4x] branch feature/can-stack-tunning updated (9ef8f55 ->
f6a1970)
This is an automated email from the ASF dual-hosted git repository.
ldywicki pushed a change to branch feature/can-stack-tunning
in repository https://gitbox.apache.org/repos/asf/plc4x.git.
omit 9ef8f55 Update of CAN related documentation.
omit e7b32cf Implementation of generic purpose CAN driver.
omit 2530287 Separate CAN transport and CAN driver.
omit 5040be3 PLC4X-294 / PLC4X-296 Introduce event listeners for connections and drivers.
add d2face5 S7 mspec test.
add 93c19d9 S7 mspec test.
add 7c1ad93 Test mspec.
add 305b5e1 Test of mspec.
add 41acabf Test mspec.
add 5482677 Test mspec.
add f0745a5 Test mspec.
add 5435aa4 Tests mspec.
add 24779bd Test mspec.
add a21ca21 Test mspec.
add 78fbff3 Test mspec.
add 6e05263 Test mspec.
add 4228b75 S7 MODE,USR,SYS support. Working on./opencv_perf_video
add 5884867 S7Event work on.
add 2d64b0d S7Event working on.
add 70cdcce S7Event working on.
add a2073a8 S7Event working on.
add 5804800 S7Event working on.
add bfe7ac3 S7Event working on.
add cfff378 S7Event working on.
add 599960b S7Event working on.
add 4140a1a S7Event working on.
add 8542328 S7Event working on.
add 922083b Merge branch 's7event' of https://github.com/glcj/plc4x into s7event
add 4c5019c S7Event working on.
add abd0d99 S7Event working on.
add 41bc00a S7Event working on.
add 05215aa S7Event working on.
add 1d0de54 S7Event working on.
add 3d0c161 Alarm processing.
add aa51b05 Alarm working on.
add b3e928c Alarm working on.
add 31b394d Alarm working on.
add c933f80 Alarm working on.
add 3c33859 Alarm working on!.
add 041ce77 Alarm event working on.
add 6c7cf27 Merge branch 's7event' of https://github.com/glcj/plc4x into s7event
add 75bd4e3 Alarm working on.
add 4f4346d Merge branch 's7event' of https://github.com/glcj/plc4x into s7event
add 2edb527 Alarm working on.
add 5f8a0ce OSGi test.
add 1820de5 Strings..
add 9f1d929 Strings..
add e00b70c String handler...
add cd9f609 Fix tools.
add 908c0eb S7Event implementation.
add 37971cf - Added a register call for the S7 Go driver.
add 509a970 - Tidied up the go.mod and go.sum
add 8da75d5 Merge branch 'develop' of github.com:apache/plc4x into s7event
add c4ea06f - Fine-tuning of the PR.
add 971cbcd - Continued porting the changes to PLC4C - Changed all usages of enum fields in the s7 to simple fields (all except one, where the enum field actually is required)
add 22f8c3b - Fixed a typo in a function name
add a3b6582 - Continued porting the changes to PLC4C - Changed all usages of enum fields in the s7 to simple fields (all except one, where the enum field actually is required)
add d8f10f2 - Continued getting the plc4c build working again
add a18e9ed - Cleaned up the pom configuration of the language test for go
add ef4d5c1 - Cleaned up the pom configuration of the language test for go
add 242bfd9 - Fixed some more enum related problems in PLC4C (We're allmost there)
add 39a999c - Fixed the output of the diff-check
add efce43c - Fixed the output of the diff-check
add 07baaf4 - Finished extending PLC4Go to use the Cesar's event extensions
add 2957ed1 Fix/ when reading OPCUA boolean type a byte is returned instead of boolean value
add 553abf1 [PLC4X-303] Support hostname lookup when resolving endpoints
add d059709 fixing timer leaks (#267)
add 60b0b3e - Simplified the handling of the transports GetNumReadableBytes to be less of a memory leak (Turns out all transports actually don't block here)
add 932cd21 Merge branch 'develop' of github.com:apache/plc4x into s7event
add 37ed824 Added options to the Discovery API which allows passing along options to fine tune how discovery is done.
add 985988e Added options to the Discovery API which allows passing along options to fine tune how discovery is done. (Adjusted the BACNet IP driver, which I must have missed adjusting)
add 0e57493 fix: PLC4X-312 - CAN NOT READ STRING FROM S7 PLC
add d7bdbe7 Restructured the internal and external parts
add 1cd8f29 Added "Option" to the name some of the DiscoveryOption types
add 4355963 Made the KNX driver interpret the "device name discovery-option"
add fc7634e Merge branch 's7event' of github.com:apache/plc4x into s7event
add 69376b3 changed delimiter of opc ua from : to ; (#258)
add 69dfa8a plc4x: major dependency updates (#252)
add 12a1b2e build(deps): bump karaf-maven-plugin from 4.3.0 to 4.3.2 (#245)
add 247beba Bump zookeeper from 3.4.13 to 3.4.14 (#270)
add 1eeb340 Bump milo.version from 0.6.1 to 0.6.3 (#269)
add a8a0289 build(deps): bump gmavenplus-plugin from 1.6.2 to 1.12.1 (#246)
add 529cbe8 build(deps): bump junit.jupiter.version from 5.7.0 to 5.7.2 (#251)
add d767dc9 fix: Updated junit.platform.version to match the updated jupiter version
add 9d4979f PLC4X-294 / PLC4X-296 Introduce event listeners for connections and drivers.
add dd8b9af Separate CAN transport and CAN driver.
add c62ecbe Implementation of generic purpose CAN driver.
add f6a1970 Update of CAN related documentation.
This update added new revisions after undoing existing revisions.
That is to say, some revisions that were in the old version of the
branch are not in the new version. This situation occurs
when a user --force pushes a change and generates a repository
containing something like this:
* -- * -- B -- O -- O -- O (9ef8f55)
\
N -- N -- N refs/heads/feature/can-stack-tunning (f6a1970)
You should already have received notification emails for all of the O
revisions, and so the following emails describe only the N revisions
from the common base, B.
Any revisions marked "omit" are not gone; other references still
refer to them. Any revisions marked "discard" are gone forever.
No new revisions were added by this update.
Summary of changes:
.../plc4x/language/c/CLanguageTemplateHelper.java | 35 +-
.../resources/templates/c/data-io-template.h.ftlh | 1 +
.../resources/templates/c/enum-template.c.ftlh | 32 +
.../resources/templates/c/enum-template.h.ftlh | 17 +
.../resources/templates/c/pojo-template.c.ftlh | 16 +-
.../resources/templates/c/pojo-template.h.ftlh | 3 +-
.../test/resources/integration-test/CMakeLists.txt | 2 +
.../include/plc4c/driver_test_static.h | 20 +-
.../language/go/GoLanguageTemplateHelper.java | 11 +-
.../resources/templates/go/model-template.go.ftlh | 26 +-
.../go/xml-parser-factory-template.go.ftlh | 12 +-
.../language-go/src/test/resources/plc4go/pom.xml | 14 +-
.../plc4x/language/java/JavaLanguageOutput.java | 1 +
.../src/main/resources/protocols/test/test.mspec | 8 +-
plc4c/drivers/modbus/CMakeLists.txt | 2 +-
.../modbus/include/plc4c/driver_modbus_static.h | 18 +-
plc4c/drivers/s7/CMakeLists.txt | 2 +-
plc4c/drivers/s7/include/plc4c/driver_s7.h | 22 -
.../plc4c/{driver_s7.h => driver_s7_static.h} | 73 +-
plc4c/drivers/s7/src/driver_s7.c | 95 -
plc4c/drivers/s7/src/driver_s7_packets.c | 21 +-
plc4c/drivers/s7/src/driver_s7_sm_read.c | 6 +-
.../s7/src/{driver_s7.c => driver_s7_static.c} | 77 +-
plc4c/drivers/s7/test/s7_test.c | 2 +-
plc4c/examples/hello-world-modbus/CMakeLists.txt | 1 +
plc4c/examples/hello-world-s7/CMakeLists.txt | 1 +
plc4c/generated-sources/modbus/include/data_item.h | 1 +
.../modbus/include/modbus_constants.h | 1 +
.../modbus/include/modbus_data_type.h | 11 +
.../modbus/include/modbus_error_code.h | 11 +
.../generated-sources/modbus/include/modbus_pdu.h | 1 +
.../modbus_pdu_read_file_record_request_item.h | 1 +
.../modbus_pdu_read_file_record_response_item.h | 1 +
.../modbus_pdu_write_file_record_request_item.h | 1 +
.../modbus_pdu_write_file_record_response_item.h | 1 +
.../modbus/include/modbus_serial_adu.h | 1 +
.../modbus/include/modbus_tcp_adu.h | 1 +
.../modbus/src/modbus_data_type.c | 31 +
.../modbus/src/modbus_error_code.c | 31 +
plc4c/generated-sources/modbus/src/modbus_pdu.c | 22 +-
.../include/alarm_message_ack_object_push_type.h | 68 +
.../s7/include/alarm_message_ack_push_type.h | 62 +
.../s7/include/alarm_message_ack_response_type.h | 59 +
.../s7/include/alarm_message_ack_type.h | 60 +
.../s7/include/alarm_message_object_ack_type.h | 69 +
.../s7/include/alarm_message_object_push_type.h | 72 +
.../s7/include/alarm_message_object_query_type.h | 71 +
.../s7/include/alarm_message_push_type.h | 62 +
...load_data_item.h => alarm_message_query_type.h} | 30 +-
.../s7/include/alarm_state_type.h | 67 +
plc4c/generated-sources/s7/include/alarm_type.h | 64 +
...payload_data_item.h => associated_value_type.h} | 22 +-
plc4c/generated-sources/s7/include/cotp_packet.h | 1 +
.../generated-sources/s7/include/cotp_parameter.h | 1 +
.../s7/include/cotp_protocol_class.h | 11 +
.../generated-sources/s7/include/cotp_tpdu_size.h | 11 +
.../s7/include/cpu_subscribe_events.h | 65 +
plc4c/generated-sources/s7/include/data_item.h | 1 +
.../s7/include/data_transport_error_code.h | 11 +
.../s7/include/data_transport_size.h | 11 +
.../s7/include/{szl_id.h => date_and_time.h} | 34 +-
plc4c/generated-sources/s7/include/device_group.h | 11 +
plc4c/generated-sources/s7/include/event_type.h | 65 +
plc4c/generated-sources/s7/include/memory_area.h | 11 +
.../s7/include/mode_transition_type.h | 70 +
plc4c/generated-sources/s7/include/query_type.h | 64 +
plc4c/generated-sources/s7/include/s7_address.h | 1 +
.../s7/include/s7_data_alarm_message.h | 98 ++
plc4c/generated-sources/s7/include/s7_message.h | 1 +
plc4c/generated-sources/s7/include/s7_parameter.h | 11 +-
.../s7/include/s7_parameter_user_data_item.h | 1 +
plc4c/generated-sources/s7/include/s7_payload.h | 1 +
.../s7/include/s7_payload_user_data_item.h | 113 +-
.../s7/include/s7_var_payload_data_item.h | 1 +
.../s7/include/s7_var_payload_status_item.h | 1 +
.../s7/include/s7_var_request_parameter_item.h | 1 +
.../s7/include/{szl_id.h => state.h} | 34 +-
.../generated-sources/s7/include/syntax_id_type.h | 74 +
.../s7/include/szl_data_tree_item.h | 1 +
plc4c/generated-sources/s7/include/szl_id.h | 1 +
.../s7/include/szl_module_type_class.h | 11 +
plc4c/generated-sources/s7/include/szl_sublist.h | 11 +
plc4c/generated-sources/s7/include/tpkt_packet.h | 1 +
.../generated-sources/s7/include/transport_size.h | 11 +
.../s7/src/alarm_message_ack_object_push_type.c | 182 ++
.../s7/src/alarm_message_ack_push_type.c | 151 ++
.../s7/src/alarm_message_ack_response_type.c | 125 ++
.../s7/src/alarm_message_ack_type.c | 134 ++
.../s7/src/alarm_message_object_ack_type.c | 186 ++
.../s7/src/alarm_message_object_push_type.c | 259 +++
.../s7/src/alarm_message_object_query_type.c | 237 +++
.../s7/src/alarm_message_push_type.c | 151 ++
.../s7/src/alarm_message_query_type.c | 191 ++
plc4c/generated-sources/s7/src/alarm_state_type.c | 114 ++
plc4c/generated-sources/s7/src/alarm_type.c | 96 +
.../s7/src/associated_value_type.c | 138 ++
plc4c/generated-sources/s7/src/cotp_packet.c | 48 +-
plc4c/generated-sources/s7/src/cotp_parameter.c | 18 +-
.../generated-sources/s7/src/cotp_protocol_class.c | 31 +
plc4c/generated-sources/s7/src/cotp_tpdu_size.c | 31 +
.../s7/src/cpu_subscribe_events.c | 102 ++
.../s7/src/data_transport_error_code.c | 31 +
.../generated-sources/s7/src/data_transport_size.c | 31 +
plc4c/generated-sources/s7/src/date_and_time.c | 165 ++
plc4c/generated-sources/s7/src/device_group.c | 31 +
plc4c/generated-sources/s7/src/event_type.c | 102 ++
plc4c/generated-sources/s7/src/memory_area.c | 31 +
.../s7/src/mode_transition_type.c | 132 ++
plc4c/generated-sources/s7/src/query_type.c | 96 +
plc4c/generated-sources/s7/src/s7_address.c | 16 +-
.../s7/src/s7_data_alarm_message.c | 372 ++++
plc4c/generated-sources/s7/src/s7_parameter.c | 162 +-
plc4c/generated-sources/s7/src/s7_payload.c | 10 +-
.../s7/src/s7_payload_user_data_item.c | 1482 ++++++++++++++--
.../s7/src/s7_var_payload_data_item.c | 34 +-
.../s7/src/s7_var_payload_status_item.c | 16 +-
plc4c/generated-sources/s7/src/state.c | 193 ++
plc4c/generated-sources/s7/src/syntax_id_type.c | 156 ++
.../generated-sources/s7/src/szl_data_tree_item.c | 2 +-
plc4c/generated-sources/s7/src/szl_id.c | 32 +-
.../s7/src/szl_module_type_class.c | 31 +
plc4c/generated-sources/s7/src/szl_sublist.c | 31 +
plc4c/generated-sources/s7/src/transport_size.c | 31 +
.../testing/protocols/s7/DriverTestsuite.xml | 55 +-
.../protocols/s7/ParserSerializerTestsuite.xml | 50 +-
plc4go/go.mod | 1 +
plc4go/go.sum | 3 -
.../plc4go/abeth/readwrite/XmlParserHelper.go | 4 +-
.../readwrite/model/CIPEncapsulationReadRequest.go | 3 +-
.../model/CIPEncapsulationReadResponse.go | 3 +-
.../readwrite/model/DF1CommandRequestMessage.go | 3 +-
plc4go/internal/plc4go/ads/Driver.go | 4 +-
.../plc4go/ads/readwrite/XmlParserHelper.go | 4 +-
.../model/AdsAddDeviceNotificationResponse.go | 3 +-
.../model/AdsDeleteDeviceNotificationResponse.go | 3 +-
.../readwrite/model/AdsReadDeviceInfoResponse.go | 3 +-
.../plc4go/ads/readwrite/model/AdsReadResponse.go | 3 +-
.../ads/readwrite/model/AdsReadStateResponse.go | 3 +-
.../ads/readwrite/model/AdsReadWriteResponse.go | 3 +-
.../ads/readwrite/model/AdsWriteControlResponse.go | 3 +-
.../plc4go/ads/readwrite/model/AdsWriteResponse.go | 3 +-
.../plc4go/ads/readwrite/model/AmsPacket.go | 15 +-
.../plc4go/ads/readwrite/model/AmsSerialFrame.go | 3 +-
.../plc4go/ads/readwrite/model/AmsTCPPacket.go | 3 +-
plc4go/internal/plc4go/bacnetip/Driver.go | 2 +-
.../plc4go/bacnetip/readwrite/XmlParserHelper.go | 20 +-
.../bacnetip/readwrite/model/APDUComplexAck.go | 3 +-
.../readwrite/model/APDUConfirmedRequest.go | 3 +-
.../plc4go/bacnetip/readwrite/model/APDUError.go | 3 +-
.../readwrite/model/APDUUnconfirmedRequest.go | 3 +-
.../BACnetConfirmedServiceRequestWriteProperty.go | 3 +-
.../model/BACnetServiceAckReadProperty.go | 3 +-
.../readwrite/model/BACnetTagWithContent.go | 3 +-
.../bacnetip/readwrite/model/BVLCForwardedNPDU.go | 3 +-
.../readwrite/model/BVLCOriginalBroadcastNPDU.go | 3 +-
.../readwrite/model/BVLCOriginalUnicastNPDU.go | 3 +-
.../df1/readwrite/model/DF1SymbolMessageFrame.go | 3 +-
plc4go/internal/plc4go/eip/Driver.go | 2 +-
.../plc4go/eip/readwrite/XmlParserHelper.go | 12 +-
.../plc4go/eip/readwrite/model/CipExchange.go | 3 +-
.../plc4go/eip/readwrite/model/CipRRData.go | 3 +-
.../eip/readwrite/model/CipUnconnectedRequest.go | 3 +-
.../eip/readwrite/model/MultipleServiceRequest.go | 3 +-
.../firmata/readwrite/model/FirmataCommandSysex.go | 3 +-
.../readwrite/model/FirmataMessageCommand.go | 3 +-
plc4go/internal/plc4go/knxnetip/Browser.go | 21 +-
plc4go/internal/plc4go/knxnetip/Connection.go | 30 +-
.../knxnetip/ConnectionDriverSpecificOperations.go | 56 +-
.../internal/plc4go/knxnetip/ConnectionHelper.go | 18 +-
.../knxnetip/ConnectionInternalOperations.go | 15 +-
plc4go/internal/plc4go/knxnetip/Discoverer.go | 42 +-
plc4go/internal/plc4go/knxnetip/Driver.go | 6 +-
plc4go/internal/plc4go/knxnetip/Reader.go | 21 +-
.../plc4go/knxnetip/readwrite/XmlParserHelper.go | 20 +-
.../readwrite/model/ApduControlContainer.go | 3 +-
.../knxnetip/readwrite/model/ApduDataContainer.go | 3 +-
.../ApduDataExtPropertyDescriptionResponse.go | 9 +-
.../knxnetip/readwrite/model/ApduDataOther.go | 3 +-
.../CEMIAdditionalInformationRelativeTimestamp.go | 3 +-
.../model/ComObjectTableRealisationType6.go | 3 +-
.../knxnetip/readwrite/model/ConnectionRequest.go | 9 +-
...ConnectionRequestInformationTunnelConnection.go | 3 +-
.../knxnetip/readwrite/model/ConnectionResponse.go | 3 +-
.../ConnectionResponseDataBlockTunnelConnection.go | 3 +-
.../readwrite/model/ConnectionStateRequest.go | 3 +-
.../readwrite/model/ConnectionStateResponse.go | 3 +-
.../knxnetip/readwrite/model/DIBDeviceInfo.go | 18 +-
.../knxnetip/readwrite/model/DescriptionRequest.go | 3 +-
.../readwrite/model/DescriptionResponse.go | 6 +-
.../readwrite/model/DeviceConfigurationAck.go | 3 +-
.../model/DeviceConfigurationAckDataBlock.go | 3 +-
.../readwrite/model/DeviceConfigurationRequest.go | 6 +-
.../readwrite/model/DeviceDescriptorType2.go | 12 +-
.../knxnetip/readwrite/model/DisconnectRequest.go | 3 +-
.../knxnetip/readwrite/model/DisconnectResponse.go | 3 +-
.../model/GroupObjectDescriptorRealisationType1.go | 6 +-
.../model/GroupObjectDescriptorRealisationType2.go | 6 +-
.../model/GroupObjectDescriptorRealisationType7.go | 6 +-
.../model/GroupObjectDescriptorRealisationTypeB.go | 6 +-
.../readwrite/model/HPAIControlEndpoint.go | 6 +-
.../knxnetip/readwrite/model/HPAIDataEndpoint.go | 6 +-
.../readwrite/model/HPAIDiscoveryEndpoint.go | 6 +-
.../knxnetip/readwrite/model/KnxManufacturer.go | 58 +-
.../plc4go/knxnetip/readwrite/model/LBusmonInd.go | 3 +-
.../plc4go/knxnetip/readwrite/model/LDataCon.go | 3 +-
.../knxnetip/readwrite/model/LDataExtended.go | 6 +-
.../plc4go/knxnetip/readwrite/model/LDataInd.go | 3 +-
.../plc4go/knxnetip/readwrite/model/LDataReq.go | 3 +-
.../plc4go/knxnetip/readwrite/model/LPollData.go | 3 +-
.../knxnetip/readwrite/model/SearchRequest.go | 3 +-
.../knxnetip/readwrite/model/SearchResponse.go | 9 +-
.../knxnetip/readwrite/model/TunnelingRequest.go | 6 +-
.../knxnetip/readwrite/model/TunnelingResponse.go | 3 +-
.../readwrite/model/TunnelingResponseDataBlock.go | 3 +-
plc4go/internal/plc4go/modbus/Driver.go | 2 +-
.../modbus/readwrite/model/ModbusSerialADU.go | 3 +-
.../plc4go/modbus/readwrite/model/ModbusTcpADU.go | 3 +-
plc4go/internal/plc4go/s7/Connection.go | 4 +-
plc4go/internal/plc4go/s7/Driver.go | 2 +-
.../internal/plc4go/s7/readwrite/ParserHelper.go | 68 +-
.../plc4go/s7/readwrite/XmlParserHelper.go | 86 +-
.../model/AlarmMessageAckObjectPushType.go | 263 +++
.../s7/readwrite/model/AlarmMessageAckPushType.go | 210 +++
.../readwrite/model/AlarmMessageAckResponseType.go | 179 ++
.../s7/readwrite/model/AlarmMessageAckType.go | 182 ++
.../readwrite/model/AlarmMessageObjectAckType.go | 265 +++
.../readwrite/model/AlarmMessageObjectPushType.go | 361 ++++
.../readwrite/model/AlarmMessageObjectQueryType.go | 367 ++++
.../s7/readwrite/model/AlarmMessagePushType.go | 210 +++
.../s7/readwrite/model/AlarmMessageQueryType.go | 260 +++
.../plc4go/s7/readwrite/model/AlarmStateType.go | 144 ++
.../plc4go/s7/readwrite/model/AlarmType.go | 120 ++
.../s7/readwrite/model/AssociatedValueType.go | 229 +++
.../readwrite/model/COTPPacketConnectionRequest.go | 15 +-
.../model/COTPPacketConnectionResponse.go | 15 +-
.../readwrite/model/COTPPacketDisconnectRequest.go | 15 +-
.../s7/readwrite/model/COTPParameterTpduSize.go | 15 +-
.../s7/readwrite/model/CpuSubscribeEvents.go | 128 ++
.../plc4go/s7/readwrite/model/DateAndTime.go | 319 ++++
.../plc4go/s7/readwrite/model/EventType.go | 128 ++
.../s7/readwrite/model/ModeTransitionType.go | 168 ++
.../plc4go/s7/readwrite/model/QueryType.go | 120 ++
.../plc4go/s7/readwrite/model/S7AddressAny.go | 15 +-
.../s7/readwrite/model/S7DataAlarmMessage.go | 192 ++
.../plc4go/s7/readwrite/model/S7EventHelper.go} | 44 +-
.../s7/readwrite/model/S7MessageObjectRequest.go | 316 ++++
.../s7/readwrite/model/S7MessageObjectResponse.go | 220 +++
.../plc4go/s7/readwrite/model/S7Parameter.go | 2 +
.../readwrite/model/S7ParameterModeTransition.go | 276 +++
.../plc4go/s7/readwrite/model/S7PayloadAlarm8.go | 174 ++
.../s7/readwrite/model/S7PayloadAlarmAckInd.go | 174 ++
.../plc4go/s7/readwrite/model/S7PayloadAlarmS.go | 174 ++
.../plc4go/s7/readwrite/model/S7PayloadAlarmSC.go | 174 ++
.../plc4go/s7/readwrite/model/S7PayloadAlarmSQ.go | 174 ++
.../readwrite/model/S7PayloadDiagnosticMessage.go | 288 +++
.../plc4go/s7/readwrite/model/S7PayloadNotify.go | 174 ++
.../plc4go/s7/readwrite/model/S7PayloadNotify8.go | 174 ++
.../plc4go/s7/readwrite/model/S7PayloadUserData.go | 2 +-
.../s7/readwrite/model/S7PayloadUserDataItem.go | 124 +-
.../S7PayloadUserDataItemCpuFunctionAlarmAck.go | 224 +++
...yloadUserDataItemCpuFunctionAlarmAckResponse.go | 221 +++
.../S7PayloadUserDataItemCpuFunctionAlarmQuery.go | 364 ++++
...oadUserDataItemCpuFunctionAlarmQueryResponse.go | 271 +++
...ayloadUserDataItemCpuFunctionMsgSubscription.go | 264 +++
...aItemCpuFunctionMsgSubscriptionAlarmResponse.go | 250 +++
...rDataItemCpuFunctionMsgSubscriptionResponse.go} | 64 +-
...ataItemCpuFunctionMsgSubscriptionSysResponse.go | 182 ++
...PayloadUserDataItemCpuFunctionReadSzlRequest.go | 70 +-
...ayloadUserDataItemCpuFunctionReadSzlResponse.go | 75 +-
.../s7/readwrite/model/S7VarPayloadDataItem.go | 32 +-
.../s7/readwrite/model/S7VarPayloadStatusItem.go | 15 +-
.../model/S7VarRequestParameterItemAddress.go | 3 +-
plc4go/internal/plc4go/s7/readwrite/model/State.go | 242 +++
.../plc4go/s7/readwrite/model/SyntaxIdType.go | 200 +++
plc4go/internal/plc4go/s7/readwrite/model/SzlId.go | 30 +-
.../plc4go/s7/readwrite/model/TPKTPacket.go | 3 +-
plc4go/internal/plc4go/spi/default/DefaultCodec.go | 11 +-
.../plc4go/spi/default/DefaultConnection.go | 10 +-
.../plc4go/spi/transports/tcp/Transport.go | 14 +-
.../plc4go/spi/transports/test/Transport.go | 1 +
.../plc4go/spi/transports/udp/Transport.go | 14 +-
plc4go/pkg/plc4go/driver.go | 2 +-
plc4go/pkg/plc4go/driverManager.go | 27 +-
plc4go/pkg/plc4go/drivers/drivers.go | 6 +
plc4go/pkg/plc4go/model/plc_discovery.go | 195 +++
plc4go/pom.xml | 2 +-
.../apache/plc4x/java/opcua/OpcuaPlcDriver.java | 1 +
.../java/opcua/config/OpcuaConfiguration.java | 7 +
.../plc4x/java/opcua/context/SecureChannel.java | 45 +-
.../apache/plc4x/java/opcua/field/OpcuaField.java | 2 +-
.../java/opcua/protocol/OpcuaProtocolLogic.java | 8 +-
.../plc4x/java/opcua/OpcuaPlcDriverTest.java | 20 +-
.../plc4x/java/opcua/protocol/OpcuaFieldTest.java | 18 +-
plc4j/drivers/s7/pom.xml | 2 +
.../apache/plc4x/java/s7/events/S7AlarmEvent.java | 687 ++++++++
.../S7CyclicValueEvent.java} | 22 +-
.../org/apache/plc4x/java/s7/events/S7Event.java | 54 +
.../apache/plc4x/java/s7/events/S7ModeEvent.java | 453 +++++
.../apache/plc4x/java/s7/events/S7SysEvent.java | 466 +++++
.../S7UserEvent.java} | 24 +-
.../apache/plc4x/java/s7/readwrite/S7Driver.java | 6 +
.../plc4x/java/s7/readwrite/field/S7Field.java | 3 +-
.../java/s7/readwrite/field/S7PlcFieldHandler.java | 4 +
.../plc4x/java/s7/readwrite/field/S7SslField.java | 71 +
.../s7/readwrite/field/S7SubscriptionField.java | 165 ++
.../readwrite/protocol/S7ProtocolEventLogic.java | 220 +++
.../s7/readwrite/protocol/S7ProtocolLogic.java | 348 +++-
.../S7SubscriptionFieldType.java} | 27 +-
.../readwrite/utils/S7PlcSubscriptionHandle.java} | 61 +-
.../plc4x/java/s7/utils/S7DiagnosticEventId.java | 684 ++++++++
.../apache/plc4x/java/s7/utils/S7EventHelper.java | 1846 ++++++++++++++++++++
.../plc4x/java/s7/utils/S7ParamErrorCode.java | 273 +++
.../apache/plc4x/java/s7/utils/StaticHelper.java | 62 +-
.../plc4x/java/s7/readwrite/field/S7FieldTest.java | 17 +
plc4j/examples/hello-connectivity-kafka/pom.xml | 2 +-
plc4j/examples/plc4j-s7event/pom.xml | 81 +
.../examples/plc4j/s7event/EventSubscription.java | 112 ++
plc4j/examples/pom.xml | 1 +
plc4j/integrations/apache-camel/pom.xml | 7 +-
.../java/org/apache/plc4x/camel/Plc4XEndpoint.java | 9 -
.../apache/plc4x/camel/Plc4XPollingConsumer.java | 185 --
.../java/org/apache/plc4x/camel/ManualTest.java | 2 +-
.../org/apache/plc4x/camel/Plc4XEndpointTest.java | 7 +-
plc4j/integrations/apache-kafka/pom.xml | 2 +-
plc4j/integrations/apache-nifi/pom.xml | 7 +-
.../java/opcuaserver/backend/Plc4xNamespace.java | 2 +-
.../plc4x/java/opcuaserver/OpcuaPlcDriverTest.java | 14 +-
plc4j/osgi/pom.xml | 2 +-
plc4j/pom.xml | 4 +-
plc4j/spi/pom.xml | 9 +-
plc4j/transports/tcp/pom.xml | 1 +
pom.xml | 60 +-
protocols/knxnetip/pom.xml | 2 +-
.../s7/src/main/resources/protocols/s7/s7.mspec | 374 +++-
.../resources/protocols/s7/DriverTestsuite.xml | 55 +-
.../protocols/s7/ParserSerializerTestsuite.xml | 50 +-
src/site/asciidoc/users/protocols/opc-ua.adoc | 8 +-
src/site/asciidoc/users/protocols/s7.adoc | 35 +-
src/site/resources/images/users/protocols/s7.png | Bin 0 -> 19399 bytes
.../resources/images/users/protocols/s7_alert.png | Bin 0 -> 19948 bytes
.../resources/images/users/protocols/s7_banner.png | Bin 0 -> 42137 bytes
.../images/users/protocols/s7_caution.png | Bin 0 -> 18944 bytes
.../resources/images/users/protocols/s7_danger.png | Bin 0 -> 20452 bytes
.../resources/images/users/protocols/s7_dont.png | Bin 0 -> 20067 bytes
.../resources/images/users/protocols/s7_ex.png | Bin 0 -> 20057 bytes
.../images/users/protocols/s7_important.png | Bin 0 -> 19667 bytes
.../resources/images/users/protocols/s7_note.png | Bin 0 -> 19486 bytes
.../resources/images/users/protocols/s7_tip.png | Bin 0 -> 20231 bytes
.../resources/images/users/protocols/s7_toddy.png | Bin 0 -> 20356 bytes
.../images/users/protocols/s7_warning.png | Bin 0 -> 19172 bytes
350 files changed, 22498 insertions(+), 1700 deletions(-)
copy plc4j/drivers/s7/src/main/java/org/apache/plc4x/java/s7/readwrite/field/S7PlcFieldHandler.java => code-generation/language-c/src/test/resources/integration-test/include/plc4c/driver_test_static.h (61%)
copy plc4j/drivers/s7/src/main/java/org/apache/plc4x/java/s7/readwrite/field/S7PlcFieldHandler.java => plc4c/drivers/modbus/include/plc4c/driver_modbus_static.h (60%)
copy plc4c/drivers/s7/include/plc4c/{driver_s7.h => driver_s7_static.h} (50%)
copy plc4c/drivers/s7/src/{driver_s7.c => driver_s7_static.c} (62%)
create mode 100644 plc4c/generated-sources/s7/include/alarm_message_ack_object_push_type.h
create mode 100644 plc4c/generated-sources/s7/include/alarm_message_ack_push_type.h
create mode 100644 plc4c/generated-sources/s7/include/alarm_message_ack_response_type.h
create mode 100644 plc4c/generated-sources/s7/include/alarm_message_ack_type.h
create mode 100644 plc4c/generated-sources/s7/include/alarm_message_object_ack_type.h
create mode 100644 plc4c/generated-sources/s7/include/alarm_message_object_push_type.h
create mode 100644 plc4c/generated-sources/s7/include/alarm_message_object_query_type.h
create mode 100644 plc4c/generated-sources/s7/include/alarm_message_push_type.h
copy plc4c/generated-sources/s7/include/{s7_var_payload_data_item.h => alarm_message_query_type.h} (53%)
create mode 100644 plc4c/generated-sources/s7/include/alarm_state_type.h
create mode 100644 plc4c/generated-sources/s7/include/alarm_type.h
copy plc4c/generated-sources/s7/include/{s7_var_payload_data_item.h => associated_value_type.h} (56%)
create mode 100644 plc4c/generated-sources/s7/include/cpu_subscribe_events.h
copy plc4c/generated-sources/s7/include/{szl_id.h => date_and_time.h} (52%)
create mode 100644 plc4c/generated-sources/s7/include/event_type.h
create mode 100644 plc4c/generated-sources/s7/include/mode_transition_type.h
create mode 100644 plc4c/generated-sources/s7/include/query_type.h
create mode 100644 plc4c/generated-sources/s7/include/s7_data_alarm_message.h
copy plc4c/generated-sources/s7/include/{szl_id.h => state.h} (55%)
create mode 100644 plc4c/generated-sources/s7/include/syntax_id_type.h
create mode 100644 plc4c/generated-sources/s7/src/alarm_message_ack_object_push_type.c
create mode 100644 plc4c/generated-sources/s7/src/alarm_message_ack_push_type.c
create mode 100644 plc4c/generated-sources/s7/src/alarm_message_ack_response_type.c
create mode 100644 plc4c/generated-sources/s7/src/alarm_message_ack_type.c
create mode 100644 plc4c/generated-sources/s7/src/alarm_message_object_ack_type.c
create mode 100644 plc4c/generated-sources/s7/src/alarm_message_object_push_type.c
create mode 100644 plc4c/generated-sources/s7/src/alarm_message_object_query_type.c
create mode 100644 plc4c/generated-sources/s7/src/alarm_message_push_type.c
create mode 100644 plc4c/generated-sources/s7/src/alarm_message_query_type.c
create mode 100644 plc4c/generated-sources/s7/src/alarm_state_type.c
create mode 100644 plc4c/generated-sources/s7/src/alarm_type.c
create mode 100644 plc4c/generated-sources/s7/src/associated_value_type.c
create mode 100644 plc4c/generated-sources/s7/src/cpu_subscribe_events.c
create mode 100644 plc4c/generated-sources/s7/src/date_and_time.c
create mode 100644 plc4c/generated-sources/s7/src/event_type.c
create mode 100644 plc4c/generated-sources/s7/src/mode_transition_type.c
create mode 100644 plc4c/generated-sources/s7/src/query_type.c
create mode 100644 plc4c/generated-sources/s7/src/s7_data_alarm_message.c
create mode 100644 plc4c/generated-sources/s7/src/state.c
create mode 100644 plc4c/generated-sources/s7/src/syntax_id_type.c
create mode 100644 plc4go/internal/plc4go/s7/readwrite/model/AlarmMessageAckObjectPushType.go
create mode 100644 plc4go/internal/plc4go/s7/readwrite/model/AlarmMessageAckPushType.go
create mode 100644 plc4go/internal/plc4go/s7/readwrite/model/AlarmMessageAckResponseType.go
create mode 100644 plc4go/internal/plc4go/s7/readwrite/model/AlarmMessageAckType.go
create mode 100644 plc4go/internal/plc4go/s7/readwrite/model/AlarmMessageObjectAckType.go
create mode 100644 plc4go/internal/plc4go/s7/readwrite/model/AlarmMessageObjectPushType.go
create mode 100644 plc4go/internal/plc4go/s7/readwrite/model/AlarmMessageObjectQueryType.go
create mode 100644 plc4go/internal/plc4go/s7/readwrite/model/AlarmMessagePushType.go
create mode 100644 plc4go/internal/plc4go/s7/readwrite/model/AlarmMessageQueryType.go
create mode 100644 plc4go/internal/plc4go/s7/readwrite/model/AlarmStateType.go
create mode 100644 plc4go/internal/plc4go/s7/readwrite/model/AlarmType.go
create mode 100644 plc4go/internal/plc4go/s7/readwrite/model/AssociatedValueType.go
create mode 100644 plc4go/internal/plc4go/s7/readwrite/model/CpuSubscribeEvents.go
create mode 100644 plc4go/internal/plc4go/s7/readwrite/model/DateAndTime.go
create mode 100644 plc4go/internal/plc4go/s7/readwrite/model/EventType.go
create mode 100644 plc4go/internal/plc4go/s7/readwrite/model/ModeTransitionType.go
create mode 100644 plc4go/internal/plc4go/s7/readwrite/model/QueryType.go
create mode 100644 plc4go/internal/plc4go/s7/readwrite/model/S7DataAlarmMessage.go
copy plc4go/{pkg/plc4go/model/plc_discovery.go => internal/plc4go/s7/readwrite/model/S7EventHelper.go} (52%)
create mode 100644 plc4go/internal/plc4go/s7/readwrite/model/S7MessageObjectRequest.go
create mode 100644 plc4go/internal/plc4go/s7/readwrite/model/S7MessageObjectResponse.go
create mode 100644 plc4go/internal/plc4go/s7/readwrite/model/S7ParameterModeTransition.go
create mode 100644 plc4go/internal/plc4go/s7/readwrite/model/S7PayloadAlarm8.go
create mode 100644 plc4go/internal/plc4go/s7/readwrite/model/S7PayloadAlarmAckInd.go
create mode 100644 plc4go/internal/plc4go/s7/readwrite/model/S7PayloadAlarmS.go
create mode 100644 plc4go/internal/plc4go/s7/readwrite/model/S7PayloadAlarmSC.go
create mode 100644 plc4go/internal/plc4go/s7/readwrite/model/S7PayloadAlarmSQ.go
create mode 100644 plc4go/internal/plc4go/s7/readwrite/model/S7PayloadDiagnosticMessage.go
create mode 100644 plc4go/internal/plc4go/s7/readwrite/model/S7PayloadNotify.go
create mode 100644 plc4go/internal/plc4go/s7/readwrite/model/S7PayloadNotify8.go
create mode 100644 plc4go/internal/plc4go/s7/readwrite/model/S7PayloadUserDataItemCpuFunctionAlarmAck.go
create mode 100644 plc4go/internal/plc4go/s7/readwrite/model/S7PayloadUserDataItemCpuFunctionAlarmAckResponse.go
create mode 100644 plc4go/internal/plc4go/s7/readwrite/model/S7PayloadUserDataItemCpuFunctionAlarmQuery.go
create mode 100644 plc4go/internal/plc4go/s7/readwrite/model/S7PayloadUserDataItemCpuFunctionAlarmQueryResponse.go
create mode 100644 plc4go/internal/plc4go/s7/readwrite/model/S7PayloadUserDataItemCpuFunctionMsgSubscription.go
create mode 100644 plc4go/internal/plc4go/s7/readwrite/model/S7PayloadUserDataItemCpuFunctionMsgSubscriptionAlarmResponse.go
copy plc4go/internal/plc4go/s7/readwrite/model/{S7PayloadUserDataItemCpuFunctionReadSzlRequest.go => S7PayloadUserDataItemCpuFunctionMsgSubscriptionResponse.go} (51%)
create mode 100644 plc4go/internal/plc4go/s7/readwrite/model/S7PayloadUserDataItemCpuFunctionMsgSubscriptionSysResponse.go
create mode 100644 plc4go/internal/plc4go/s7/readwrite/model/State.go
create mode 100644 plc4go/internal/plc4go/s7/readwrite/model/SyntaxIdType.go
create mode 100644 plc4j/drivers/s7/src/main/java/org/apache/plc4x/java/s7/events/S7AlarmEvent.java
copy plc4j/drivers/s7/src/main/java/org/apache/plc4x/java/s7/{readwrite/field/S7PlcFieldHandler.java => events/S7CyclicValueEvent.java} (61%)
create mode 100644 plc4j/drivers/s7/src/main/java/org/apache/plc4x/java/s7/events/S7Event.java
create mode 100644 plc4j/drivers/s7/src/main/java/org/apache/plc4x/java/s7/events/S7ModeEvent.java
create mode 100644 plc4j/drivers/s7/src/main/java/org/apache/plc4x/java/s7/events/S7SysEvent.java
copy plc4j/drivers/s7/src/main/java/org/apache/plc4x/java/s7/{readwrite/field/S7PlcFieldHandler.java => events/S7UserEvent.java} (61%)
create mode 100644 plc4j/drivers/s7/src/main/java/org/apache/plc4x/java/s7/readwrite/field/S7SslField.java
create mode 100644 plc4j/drivers/s7/src/main/java/org/apache/plc4x/java/s7/readwrite/field/S7SubscriptionField.java
create mode 100644 plc4j/drivers/s7/src/main/java/org/apache/plc4x/java/s7/readwrite/protocol/S7ProtocolEventLogic.java
copy plc4j/drivers/s7/src/main/java/org/apache/plc4x/java/s7/readwrite/{field/S7PlcFieldHandler.java => types/S7SubscriptionFieldType.java} (61%)
rename plc4j/{integrations/apache-camel/src/test/java/org/apache/plc4x/camel/Plc4XPollingConsumerTest.java => drivers/s7/src/main/java/org/apache/plc4x/java/s7/readwrite/utils/S7PlcSubscriptionHandle.java} (57%)
create mode 100644 plc4j/drivers/s7/src/main/java/org/apache/plc4x/java/s7/utils/S7DiagnosticEventId.java
create mode 100644 plc4j/drivers/s7/src/main/java/org/apache/plc4x/java/s7/utils/S7EventHelper.java
create mode 100644 plc4j/drivers/s7/src/main/java/org/apache/plc4x/java/s7/utils/S7ParamErrorCode.java
create mode 100644 plc4j/examples/plc4j-s7event/pom.xml
create mode 100644 plc4j/examples/plc4j-s7event/src/main/java/org/apache/plc4x/examples/plc4j/s7event/EventSubscription.java
delete mode 100644 plc4j/integrations/apache-camel/src/main/java/org/apache/plc4x/camel/Plc4XPollingConsumer.java
create mode 100644 src/site/resources/images/users/protocols/s7.png
create mode 100644 src/site/resources/images/users/protocols/s7_alert.png
create mode 100644 src/site/resources/images/users/protocols/s7_banner.png
create mode 100644 src/site/resources/images/users/protocols/s7_caution.png
create mode 100644 src/site/resources/images/users/protocols/s7_danger.png
create mode 100644 src/site/resources/images/users/protocols/s7_dont.png
create mode 100644 src/site/resources/images/users/protocols/s7_ex.png
create mode 100644 src/site/resources/images/users/protocols/s7_important.png
create mode 100644 src/site/resources/images/users/protocols/s7_note.png
create mode 100644 src/site/resources/images/users/protocols/s7_tip.png
create mode 100644 src/site/resources/images/users/protocols/s7_toddy.png
create mode 100644 src/site/resources/images/users/protocols/s7_warning.png