This is an automated email from the ASF dual-hosted git repository. cgarcia pushed a commit to branch fix/s7hmux in repository https://gitbox.apache.org/repos/asf/plc4x.git
commit 675b610fce13a89404138dc5dee9d96d36b67ccf Merge: 83360f6ac1 31fd33c622 Author: César José García León <[email protected]> AuthorDate: Sat May 24 16:38:17 2025 -0400 Merge branch 'develop' into fix/s7hmux .mvn/extensions.xml | 4 +- .../apache/plc4x/language/cs/CsLanguageOutput.java | 10 +- .../language/cs/CsLanguageTemplateHelper.java | 60 + .../templates/cs/data-io-template.cs.ftlh | 5 +- .../resources/templates/cs/enum-template.cs.ftlh | 5 +- .../resources/templates/cs/io-template.cs.ftlh | 5 +- .../resources/templates/cs/model-template.cs.ftlh | 5 +- plc4c/pom.xml | 2 +- plc4go/go.mod | 12 +- plc4go/go.sum | 24 +- plc4go/pom.xml | 7 +- .../bacnetip/readwrite/model/BACnetVendorId.go | 160 +- .../knxnetip/readwrite/model/KnxDatapointType.go | 3569 ++++++++++++++++++-- .../knxnetip/readwrite/model/KnxManufacturer.go | 200 +- .../java/bacnetip/readwrite/BACnetVendorId.java | 14 +- plc4j/drivers/ctrlx/pom.xml | 2 +- plc4j/drivers/knxnetip/pom.xml | 5 + .../java/knxnetip/readwrite/KnxDatapointType.java | 1753 +++++++++- .../java/knxnetip/readwrite/KnxManufacturer.java | 18 +- .../apache/plc4x/java/knxnetip/ets/EtsParser.java | 3 + .../modbus/base/optimizer/ModbusOptimizer.java | 13 +- .../modbus/base/protocol/ModbusProtocolLogic.java | 20 +- .../java/modbus/ManualModbusTCPDriverTest.java | 10 +- plc4j/drivers/opcua/pom.xml | 8 +- .../java/opcua/config/OpcuaConfiguration.java | 4 +- .../java/opcua/context/OpcuaDriverContext.java | 7 - .../plc4x/java/opcua/context/SecureChannel.java | 67 +- .../plc4x/java/opcua/OpcuaPlcDriverTest.java | 26 +- .../java/s7/readwrite/ManualS71200DriverTest.java | 4 +- plc4net/api/api/types/PlcValueType.cs | 98 + plc4net/api/plc4net-api.csproj | 3 +- .../plc4net-driver-knxproj-test.csproj | 1 + .../drivers/knxnetip/plc4net-driver-knxproj.csproj | 1 + .../knxnetip/readwrite/model/AccessLevel.cs | 1 + .../src/drivers/knxnetip/readwrite/model/Apdu.cs | 1 + .../knxnetip/readwrite/model/ApduControl.cs | 1 + .../knxnetip/readwrite/model/ApduControlAck.cs | 1 + .../knxnetip/readwrite/model/ApduControlConnect.cs | 1 + .../readwrite/model/ApduControlContainer.cs | 1 + .../readwrite/model/ApduControlDisconnect.cs | 1 + .../knxnetip/readwrite/model/ApduControlNack.cs | 1 + .../drivers/knxnetip/readwrite/model/ApduData.cs | 1 + .../knxnetip/readwrite/model/ApduDataAdcRead.cs | 1 + .../readwrite/model/ApduDataAdcResponse.cs | 1 + .../knxnetip/readwrite/model/ApduDataContainer.cs | 1 + .../model/ApduDataDeviceDescriptorRead.cs | 1 + .../model/ApduDataDeviceDescriptorResponse.cs | 1 + .../knxnetip/readwrite/model/ApduDataExt.cs | 1 + .../readwrite/model/ApduDataExtAuthorizeRequest.cs | 1 + .../model/ApduDataExtAuthorizeResponse.cs | 1 + .../model/ApduDataExtDomainAddressRead.cs | 1 + .../model/ApduDataExtDomainAddressResponse.cs | 1 + .../model/ApduDataExtDomainAddressSelectiveRead.cs | 1 + .../ApduDataExtDomainAddressSerialNumberRead.cs | 1 + ...ApduDataExtDomainAddressSerialNumberResponse.cs | 1 + .../ApduDataExtDomainAddressSerialNumberWrite.cs | 1 + .../model/ApduDataExtDomainAddressWrite.cs | 1 + .../model/ApduDataExtFileStreamInfoReport.cs | 1 + .../ApduDataExtGroupPropertyValueInfoReport.cs | 1 + .../model/ApduDataExtGroupPropertyValueRead.cs | 1 + .../model/ApduDataExtGroupPropertyValueResponse.cs | 1 + .../model/ApduDataExtGroupPropertyValueWrite.cs | 1 + ...ApduDataExtIndividualAddressSerialNumberRead.cs | 1 + ...DataExtIndividualAddressSerialNumberResponse.cs | 1 + ...pduDataExtIndividualAddressSerialNumberWrite.cs | 1 + .../readwrite/model/ApduDataExtKeyResponse.cs | 1 + .../readwrite/model/ApduDataExtKeyWrite.cs | 1 + .../readwrite/model/ApduDataExtLinkRead.cs | 1 + .../readwrite/model/ApduDataExtLinkResponse.cs | 1 + .../readwrite/model/ApduDataExtLinkWrite.cs | 1 + .../readwrite/model/ApduDataExtMemoryBitWrite.cs | 1 + .../model/ApduDataExtNetworkParameterRead.cs | 1 + .../model/ApduDataExtNetworkParameterResponse.cs | 1 + .../model/ApduDataExtNetworkParameterWrite.cs | 1 + .../model/ApduDataExtOpenRoutingTableRequest.cs | 1 + .../model/ApduDataExtPropertyDescriptionRead.cs | 1 + .../ApduDataExtPropertyDescriptionResponse.cs | 1 + .../model/ApduDataExtPropertyValueRead.cs | 1 + .../model/ApduDataExtPropertyValueResponse.cs | 1 + .../model/ApduDataExtPropertyValueWrite.cs | 1 + .../model/ApduDataExtReadRouterMemoryRequest.cs | 1 + .../model/ApduDataExtReadRouterMemoryResponse.cs | 1 + .../model/ApduDataExtReadRouterStatusRequest.cs | 1 + .../model/ApduDataExtReadRouterStatusResponse.cs | 1 + .../model/ApduDataExtReadRoutingTableRequest.cs | 1 + .../model/ApduDataExtReadRoutingTableResponse.cs | 1 + .../model/ApduDataExtWriteRouterMemoryRequest.cs | 1 + .../model/ApduDataExtWriteRouterStatusRequest.cs | 1 + .../model/ApduDataExtWriteRoutingTableRequest.cs | 1 + .../readwrite/model/ApduDataGroupValueRead.cs | 1 + .../readwrite/model/ApduDataGroupValueResponse.cs | 1 + .../readwrite/model/ApduDataGroupValueWrite.cs | 1 + .../model/ApduDataIndividualAddressRead.cs | 1 + .../model/ApduDataIndividualAddressResponse.cs | 1 + .../model/ApduDataIndividualAddressWrite.cs | 1 + .../knxnetip/readwrite/model/ApduDataMemoryRead.cs | 1 + .../readwrite/model/ApduDataMemoryResponse.cs | 1 + .../readwrite/model/ApduDataMemoryWrite.cs | 1 + .../knxnetip/readwrite/model/ApduDataOther.cs | 1 + .../knxnetip/readwrite/model/ApduDataRestart.cs | 1 + .../readwrite/model/ApduDataUserMessage.cs | 1 + .../src/drivers/knxnetip/readwrite/model/CEMI.cs | 1 + .../readwrite/model/CEMIAdditionalInformation.cs | 1 + .../CEMIAdditionalInformationBusmonitorInfo.cs | 1 + .../CEMIAdditionalInformationRelativeTimestamp.cs | 1 + .../knxnetip/readwrite/model/CEMIPriority.cs | 1 + .../knxnetip/readwrite/model/ChannelInformation.cs | 1 + .../knxnetip/readwrite/model/ComObjectTable.cs | 1 + .../readwrite/model/ComObjectTableAddresses.cs | 1 + .../model/ComObjectTableRealisationType1.cs | 1 + .../model/ComObjectTableRealisationType2.cs | 1 + .../model/ComObjectTableRealisationType6.cs | 1 + .../knxnetip/readwrite/model/ComObjectValueType.cs | 1 + .../knxnetip/readwrite/model/ConnectionRequest.cs | 1 + .../model/ConnectionRequestInformation.cs | 1 + ...ConnectionRequestInformationDeviceManagement.cs | 1 + ...ConnectionRequestInformationTunnelConnection.cs | 1 + .../knxnetip/readwrite/model/ConnectionResponse.cs | 1 + .../readwrite/model/ConnectionResponseDataBlock.cs | 1 + .../ConnectionResponseDataBlockDeviceManagement.cs | 1 + .../ConnectionResponseDataBlockTunnelConnection.cs | 1 + .../readwrite/model/ConnectionStateRequest.cs | 1 + .../readwrite/model/ConnectionStateResponse.cs | 1 + .../knxnetip/readwrite/model/DIBDeviceInfo.cs | 1 + .../knxnetip/readwrite/model/DIBSuppSvcFamilies.cs | 1 + .../knxnetip/readwrite/model/DescriptionRequest.cs | 1 + .../readwrite/model/DescriptionResponse.cs | 1 + .../readwrite/model/DeviceConfigurationAck.cs | 1 + .../model/DeviceConfigurationAckDataBlock.cs | 1 + .../readwrite/model/DeviceConfigurationRequest.cs | 1 + .../model/DeviceConfigurationRequestDataBlock.cs | 1 + .../knxnetip/readwrite/model/DeviceDescriptor.cs | 1 + .../readwrite/model/DeviceDescriptorMediumType.cs | 1 + .../readwrite/model/DeviceDescriptorType2.cs | 1 + .../knxnetip/readwrite/model/DeviceStatus.cs | 1 + .../knxnetip/readwrite/model/DisconnectRequest.cs | 1 + .../knxnetip/readwrite/model/DisconnectResponse.cs | 1 + .../knxnetip/readwrite/model/FirmwareType.cs | 1 + .../model/GroupObjectDescriptorRealisationType1.cs | 1 + .../model/GroupObjectDescriptorRealisationType2.cs | 1 + .../model/GroupObjectDescriptorRealisationType6.cs | 1 + .../model/GroupObjectDescriptorRealisationType7.cs | 1 + .../model/GroupObjectDescriptorRealisationTypeB.cs | 1 + .../readwrite/model/HPAIControlEndpoint.cs | 1 + .../knxnetip/readwrite/model/HPAIDataEndpoint.cs | 1 + .../readwrite/model/HPAIDiscoveryEndpoint.cs | 1 + .../knxnetip/readwrite/model/HostProtocolCode.cs | 1 + .../drivers/knxnetip/readwrite/model/IPAddress.cs | 1 + .../drivers/knxnetip/readwrite/model/KnxAddress.cs | 1 + .../knxnetip/readwrite/model/KnxDatapoint.cs | 1 + .../readwrite/model/KnxDatapointMainType.cs | 1 + .../knxnetip/readwrite/model/KnxDatapointType.cs | 2837 ++++++++++++++-- .../knxnetip/readwrite/model/KnxGroupAddress.cs | 1 + .../readwrite/model/KnxGroupAddress2Level.cs | 1 + .../readwrite/model/KnxGroupAddress3Level.cs | 1 + .../readwrite/model/KnxGroupAddressFreeLevel.cs | 1 + .../readwrite/model/KnxInterfaceObjectProperty.cs | 1 + .../readwrite/model/KnxInterfaceObjectType.cs | 1 + .../drivers/knxnetip/readwrite/model/KnxLayer.cs | 1 + .../knxnetip/readwrite/model/KnxManufacturer.cs | 99 +- .../drivers/knxnetip/readwrite/model/KnxMedium.cs | 1 + .../knxnetip/readwrite/model/KnxNetIpCore.cs | 1 + .../readwrite/model/KnxNetIpDeviceManagement.cs | 1 + .../knxnetip/readwrite/model/KnxNetIpMessage.cs | 1 + .../knxnetip/readwrite/model/KnxNetIpRouting.cs | 1 + .../knxnetip/readwrite/model/KnxNetIpTunneling.cs | 1 + .../knxnetip/readwrite/model/KnxNetObjectServer.cs | 1 + .../model/KnxNetRemoteConfigurationAndDiagnosis.cs | 1 + .../readwrite/model/KnxNetRemoteLogging.cs | 1 + .../knxnetip/readwrite/model/KnxProperty.cs | 1 + .../readwrite/model/KnxPropertyDataType.cs | 1 + .../drivers/knxnetip/readwrite/model/LBusmonInd.cs | 1 + .../drivers/knxnetip/readwrite/model/LDataCon.cs | 1 + .../knxnetip/readwrite/model/LDataExtended.cs | 1 + .../drivers/knxnetip/readwrite/model/LDataFrame.cs | 1 + .../knxnetip/readwrite/model/LDataFrameACK.cs | 1 + .../drivers/knxnetip/readwrite/model/LDataInd.cs | 1 + .../drivers/knxnetip/readwrite/model/LDataReq.cs | 1 + .../drivers/knxnetip/readwrite/model/LPollData.cs | 1 + .../knxnetip/readwrite/model/LPollDataCon.cs | 1 + .../knxnetip/readwrite/model/LPollDataReq.cs | 1 + .../drivers/knxnetip/readwrite/model/LRawCon.cs | 1 + .../drivers/knxnetip/readwrite/model/LRawInd.cs | 1 + .../drivers/knxnetip/readwrite/model/LRawReq.cs | 1 + .../drivers/knxnetip/readwrite/model/MACAddress.cs | 1 + .../readwrite/model/MFuncPropCommandReq.cs | 1 + .../knxnetip/readwrite/model/MFuncPropCon.cs | 1 + .../readwrite/model/MFuncPropStateReadReq.cs | 1 + .../knxnetip/readwrite/model/MPropInfoInd.cs | 1 + .../knxnetip/readwrite/model/MPropReadCon.cs | 1 + .../knxnetip/readwrite/model/MPropReadReq.cs | 1 + .../knxnetip/readwrite/model/MPropWriteCon.cs | 1 + .../knxnetip/readwrite/model/MPropWriteReq.cs | 1 + .../drivers/knxnetip/readwrite/model/MResetInd.cs | 1 + .../drivers/knxnetip/readwrite/model/MResetReq.cs | 1 + .../model/ProjectInstallationIdentifier.cs | 1 + .../knxnetip/readwrite/model/RelativeTimestamp.cs | 1 + .../knxnetip/readwrite/model/RoutingIndication.cs | 1 + .../knxnetip/readwrite/model/SearchRequest.cs | 1 + .../knxnetip/readwrite/model/SearchResponse.cs | 1 + .../drivers/knxnetip/readwrite/model/ServiceId.cs | 1 + .../src/drivers/knxnetip/readwrite/model/Status.cs | 1 + .../readwrite/model/SupportedPhysicalMedia.cs | 1 + .../knxnetip/readwrite/model/TDataConnectedInd.cs | 1 + .../knxnetip/readwrite/model/TDataConnectedReq.cs | 1 + .../knxnetip/readwrite/model/TDataIndividualInd.cs | 1 + .../knxnetip/readwrite/model/TDataIndividualReq.cs | 1 + .../knxnetip/readwrite/model/TunnelingRequest.cs | 1 + .../readwrite/model/TunnelingRequestDataBlock.cs | 1 + .../knxnetip/readwrite/model/TunnelingResponse.cs | 1 + .../readwrite/model/TunnelingResponseDataBlock.cs | 1 + .../knxnetip/readwrite/model/UnknownMessage.cs | 1 + plc4net/pom.xml | 5 + plc4net/spi/plc4net-spi.csproj | 1 + pom.xml | 50 +- protocols/bacnetip/pom.xml | 2 +- .../protocols/bacnetip/bacnet-vendorids.mspec | 12 +- protocols/knxnetip/pom.xml | 2 +- .../protocols/knxnetip/knx-master-data.mspec | 729 ++-- protocols/knxnetip/src/main/xslt/knx-types.xsl | 152 +- protocols/opcua/pom.xml | 2 +- tools/NOTES.md | 22 - tools/check_sigs.sh | 77 - tools/clean-site.sh | 35 - tools/common.sh | 193 -- tools/download_staged_release.sh | 144 - tools/release-0-update-generated-code.sh | 62 +- tools/release-1-create-branch.sh | 51 +- tools/release-2-prepare-release.sh | 90 +- tools/release-3-perform-release.sh | 65 - tools/validate-release.sh | 37 +- .../developers/pages/release/build-tools.adoc | 2 +- .../users/images/users/companies/logo-accso.png | Bin 0 -> 2375 bytes .../modules/users/pages/commercial-support.adoc | 10 +- 234 files changed, 8885 insertions(+), 2096 deletions(-)
