You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@plc4x.apache.org by hu...@apache.org on 2023/01/18 12:54:50 UTC
[plc4x] branch plc4j/profinet updated (6d142a3b62 -> c305854eef)
This is an automated email from the ASF dual-hosted git repository.
hutcheb pushed a change to branch plc4j/profinet
in repository https://gitbox.apache.org/repos/asf/plc4x.git
from 6d142a3b62 fix(readme): Flattening the tags returned by browsing.
add cb8e7e026c fix(build): fixed python build badge
add 0faa5ca0ca build(deps): bump golang.org/x/tools from 0.4.0 to 0.5.0 in /plc4go (#727)
add 72b4832e15 build(deps): bump byte-buddy from 1.12.20 to 1.12.21 (#726)
add c203b92ba7 build(deps): bump github.com/schollz/progressbar/v3 in /plc4go (#728)
add 0cc434f0d1 build(deps): bump assertj-core from 3.23.1 to 3.24.0 (#730)
add 17d7f765c6 feat(plc4go/modbus): Implementing the correct reading of BOOL type
add b9749d7bc6 Merge remote-tracking branch 'origin/develop' into develop
add 8a793e26d8 Revert "feat(plc4go/modbus): Implementing the correct reading of BOOL type"
add 8c49f4c5ad fix(plc4j/modbus): Cleanup of ModbusTag (#732)
add 0a19df2e74 feat(plc4j/opcua): update node id services
add 86b07fb9e9 feat(plc4go/bacnet): update udp comms
add 2d5a2b5b6e build(deps): bump assertj-core from 3.24.0 to 3.24.1 (#733)
add c96fbeb77d build(deps): bump gson from 2.10 to 2.10.1 (#734)
add 1e52ba4c57 build(deps): bump junit.jupiter.version from 5.9.1 to 5.9.2 (#735)
add 48494acb25 build(deps): bump error_prone_annotations from 2.17.0 to 2.18.0 (#736)
add b93d2e48ec feat(plc4go/bacnet): port task manager
add 8e25dd229c refactor(plc4go/bacnet): smaller cleanups
add d1cbe41c7e refactor(plc4go/bacnet): cleanup package structure
add 3e3e3516a4 chore: update licence headers (https fix)
add c38612ca75 build(deps): bump checker-qual from 3.28.0 to 3.29.0 (#729)
add 9c527a97b1 Make sure packet len is specified to avoid serialization errors.
add 200209598f build(deps): bump karaf-maven-plugin from 4.4.2 to 4.4.3 (#737)
add 8869fab7a0 build(deps): bump jakarta.activation-api from 2.1.0 to 2.1.1 (#738)
add fd426b87f3 build(deps): bump maven-surefire-plugin from 3.0.0-M7 to 3.0.0-M8 (#739)
add e3586dcafa build(deps): bump maven-dependency-plugin from 3.1.2 to 3.5.0 (#742)
add b20829abe2 build(deps): bump byte-buddy from 1.12.21 to 1.12.22 (#741)
add 5df3e9cf8f build(deps): bump xmlunit.version from 2.9.0 to 2.9.1 (#740)
add 75872b46ef fix(plc4go/bacnet): smaller fixes relating udp comm
add 609f6afbf2 fix(plc4go/bacnet): fixed a bunch of broken code parts
add 2265a6ad5b feat(plc4go/bacnet): first comm went through new stack
add 60381995b6 fix(readme): Add PLC4X website link to the PLC4X image in the readme
add 574dd3f633 feat(plc4go/bacnet): basic comm working
add 7ff73a2cf6 fix(plc-simulator/bacnet): simulator should now respond to the right ip on bacnet
add eb59f7c111 feat(plc4go/bacnet): fix some open issues regarding task processing
add 55f7913ed3 feat(plc4go/bacnet): basic mapping to reader/writer
add 8eeec1e33b feat(bacnet): update vendors
add f02c4c53a6 feat(knx): update vendors
add 4f51eef495 feat(bacnet): update vendors
add 90e30e30ec feat(knx): update vendors
add 56ba6a4490 Revert "build(deps): bump maven-dependency-plugin from 3.1.2 to 3.5.0 (#742)"
add 7fba0884b9 build(deps): bump mockito.version from 4.11.0 to 5.0.0 (#746)
add 1914f95637 build(deps): bump freemarker from 2.3.31 to 2.3.32 (#744)
add d86f74a1de build(deps): bump netty-bom from 4.1.86.Final to 4.1.87.Final (#745)
add 82226c1f4a build(deps): react to changes on root pom.xml
add 6611730fd5 build: fix build
add 645814eabe build(deps): bump kotlin.version from 1.7.22 to 1.8.0 (#718)
add 71ba1a836a Revert "build(deps): bump kotlin.version from 1.7.22 to 1.8.0 (#718)"
add ecd9c67473 Merge branch 'develop' into plc4j/profinet
add a8686cf2cb Update java-platform.yml
add d465153d5e fix(prereq): Remove trailing -ea string in Java version string for version 20
add 55cd1be0db Merge branch 'develop' into plc4j/profinet
add c305854eef fix(plc4j/profinet): Expanded supported data types.
No new revisions were added by this update.
Summary of changes:
.github/workflows/java-platform.yml | 3 +-
README.md | 6 +-
plc4c/tools/plc4x-server/src/plc4x_server.c | 2 +-
plc4go/go.mod | 10 +-
plc4go/go.sum | 22 +-
plc4go/internal/bacnetip/ApplicationLayer.go | 73 +++--
plc4go/internal/bacnetip/ApplicationModule.go | 61 ++--
.../bacnetip/BACnetVirtualLinkLayerService.go | 54 +++-
plc4go/internal/bacnetip/Capability.go | 4 +
plc4go/internal/bacnetip/CommunicationsModule.go | 6 +-
plc4go/internal/bacnetip/Core.go | 66 +++-
plc4go/internal/bacnetip/Device.go | 190 ++++++++++++
plc4go/internal/bacnetip/IOCBModule.go | 30 +-
.../bacnetip/{local/Device.go => LocalDevice.go} | 3 +-
plc4go/internal/bacnetip/MessageCodec.go | 105 +++++--
plc4go/internal/bacnetip/NetworkService.go | 331 +++++++++++++++++++--
plc4go/internal/bacnetip/Object.go | 9 +-
plc4go/internal/bacnetip/PDU.go | 58 +++-
plc4go/internal/bacnetip/Reader.go | 8 +-
plc4go/internal/bacnetip/Task.go | 306 ++++++++++++++++++-
.../internal/bacnetip/UDPCommunicationsModule.go | 283 +++++++++++++++++-
plc4go/internal/bacnetip/service/Device.go | 28 --
plc4go/internal/bacnetip/service/Object.go | 28 --
.../bacnetip/readwrite/model/BACnetVendorId.go | 48 +++
.../knxnetip/readwrite/model/KnxManufacturer.go | 88 +++++-
.../java/bacnetip/readwrite/BACnetVendorId.java | 3 +
.../java/knxnetip/readwrite/KnxManufacturer.java | 8 +-
.../plc4x/java/modbus/base/tag/ModbusTag.java | 51 +++-
.../plc4x/java/modbus/base/tag/ModbusTagCoil.java | 16 +-
.../modbus/base/tag/ModbusTagDiscreteInput.java | 18 +-
.../modbus/base/tag/ModbusTagExtendedRegister.java | 17 +-
.../modbus/base/tag/ModbusTagHoldingRegister.java | 16 +-
.../modbus/base/tag/ModbusTagInputRegister.java | 16 +-
.../apache/plc4x/java/modbus/ModbusTagTest.java | 131 +++++---
.../java/profinet/readwrite/ProfinetDataType.java | 132 ++++++++
.../plc4x/java/profinet/device/ProfinetDevice.java | 3 +-
.../java/profinet/device/ProfinetEmptyModule.java | 3 +-
.../plc4x/java/profinet/device/ProfinetModule.java | 4 +-
.../java/profinet/device/ProfinetModuleImpl.java | 35 ++-
.../java/profinet/gsdml/ProfinetDeviceItem.java | 19 ++
.../java/profinet/gsdml/ProfinetModuleItem.java | 14 +-
.../plc4x/java/profinet/ProfinetBrowseTests.java | 7 +-
.../drivers/profinet/src/test/resources/gsdml.xml | 2 +-
.../s7/readwrite/protocol/S7ProtocolLogic.java | 2 +-
plc4j/examples/hello-world-kotlin/pom.xml | 2 +-
plc4j/integrations/apache-calcite/pom.xml | 4 +-
.../plc4x/nifi/Plc4xSourceRecordProcessor.java | 2 +-
.../plc4x/nifi/Plc4xSourceRecordProcessorTest.java | 2 +-
.../apache/plc4x/java/spi/utils/ascii/BoxSet.java | 2 +-
.../plc4x/java/opm/PlcEntityInterceptorTest.java | 4 +-
.../server/bacnet/BacnetServerModule.java | 8 +-
.../bacnet/protocol/BacnetServerAdapter.java | 2 +-
.../java/org/apache/plc4x/test/hex/HexDiff.java | 2 +-
pom.xml | 22 +-
.../apache/plc4x/protocol/mqtt/MqttProtocol.java | 2 +-
.../src/main/resources/protocols/mqtt/mqtt.mspec | 2 +-
.../protocols/mqtt/ParserSerializerTestsuite.xml | 2 +-
.../openprotocol/OpenProtocolProtocol.java | 2 +-
.../protocols/openprotocol/open-protocol.mspec | 2 +-
.../resources/protocols/profinet/profinet.mspec | 30 ++
sandbox/plc4py/plc4py/api/listener/__init__.py | 2 +-
.../plc4py/drivers/modbus/ModbusConfiguration.py | 2 +-
.../plc4py/plc4py/drivers/modbus/ModbusProtocol.py | 2 +-
sandbox/plc4py/plc4py/spi/Plc4xBaseProtocol.py | 2 +-
.../plc4py/spi/configuration/PlcConfiguration.py | 2 +-
.../plc4py/plc4py/spi/configuration/__init__.py | 2 +-
.../plc4py/plc4py/spi/connection/ProtocolStack.py | 2 +-
sandbox/plc4py/plc4py/spi/connection/__init__.py | 2 +-
sandbox/plc4py/plc4py/spi/context/DriverContext.py | 2 +-
sandbox/plc4py/plc4py/spi/context/__init__.py | 2 +-
.../plc4py/plc4py/spi/messages/ChannelMessage.py | 2 +-
.../plc4py/spi/transport/Plc4xBaseTransport.py | 2 +-
.../plc4py/plc4py/spi/transport/TCPTransport.py | 2 +-
sandbox/plc4py/plc4py/spi/transport/__init__.py | 2 +-
.../plc4py/tests/unit/plc4py/drivers/__init__.py | 2 +-
.../tests/unit/plc4py/drivers/modbus/__init__.py | 2 +-
sandbox/plc4py/tests/unit/plc4py/spi/__init__.py | 2 +-
.../unit/plc4py/spi/configuration/__init__.py | 2 +-
.../plc4py/spi/configuration/test_configuration.py | 2 +-
.../plc4py/tests/unit/plc4py/spi/tcp/__init__.py | 2 +-
sandbox/plc4py/tests/unit/plc4py/spi/tcp/server.py | 2 +-
.../plc4py/tests/unit/plc4py/spi/test_protocol.py | 2 +-
.../plc4py/tests/unit/plc4py/spi/test_transport.py | 2 +-
src/main/script/prerequisiteCheck.groovy | 3 +-
84 files changed, 2025 insertions(+), 433 deletions(-)
create mode 100644 plc4go/internal/bacnetip/Device.go
rename plc4go/internal/bacnetip/{local/Device.go => LocalDevice.go} (97%)
delete mode 100644 plc4go/internal/bacnetip/service/Device.go
delete mode 100644 plc4go/internal/bacnetip/service/Object.go
create mode 100644 plc4j/drivers/profinet/src/main/generated/org/apache/plc4x/java/profinet/readwrite/ProfinetDataType.java