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 2020/10/18 22:50:06 UTC
[plc4x] branch feature/beckhoff-discovery updated (ed3fa8d ->
bf6ac83)
This is an automated email from the ASF dual-hosted git repository.
ldywicki pushed a change to branch feature/beckhoff-discovery
in repository https://gitbox.apache.org/repos/asf/plc4x.git.
discard ed3fa8d Brief support for AMS/ADS discovery packets.
add 1f51a69 added Apache Con 2020 Videos
add 040ed71 Update blogs-videos-and-slides.adoc
add ea1d8bb Refactor Field Handler Classes
add 28ec2bf Fixed issue in new PlcValues.of function. Is able to correctly pass standard data types now.
add e6df50e Draft for writeFloat in WriteBUffer
add 6db621a Add support for writing floating point.
add 3ca264c Add support for Big Interger write (untested)
add b78b299 replace Modbus fromPLCValue function with staticSerialise functions. (Needs to be fixed to include changes from Data Type PR)
add ccdf77d Merge branch 'develop' into Bug/AddWriteBufferSupportFloatBigInt
add 0b7d25c Moved Modbus over to use the static Serializer. I'll do some more testing tomorrow, but seems to work with Big Ints and Floats
add 28a322b Fixed support for ULINT writing
add 4fdf673 Refactored the BigInteger functions
add 77267cd Merge branch 'Bug/AddWriteBufferSupportFloatBigInt' into RefactorFieldHandler
add 27df4a6 Add support for writing arrays to the hello world write example.
add dd0aab6 Merge branch 'Feature/Hello-World-Write-Arrays' into RefactorFieldHandler
add 45d96cf Implemented staticSerialize write list functions
add cbe9243 Merge branch 'Bug/AddWriteBufferSupportFloatBigInt' into RefactorFieldHandler
add e1c7701 Overrode methods on PlcValue classes and fixed list serializer
add 95dcf27 Add Support for writing lists of booleans
add 90fc914 Modified non Modbus field handler classes to modbus format Wasn't able to test other protocols.
add 8df8207 Reverted Commit 90fc914ec3e72a91af514742fb6dc85a34e99c9f
add af00614 Removed Class Lookup in new PlcValues.of Function Add getPlcDataType to Plcfield Interface to allow generalizing the fieldHandler classes. Add getBooleanArray() to WORD type PlcValue classes. Add fix for staticSerializer when writing lists.
add 5c95e44 Add checking for malformed write requests Modbus When writing arrays if the number of values didn't match the number of addresses a malformed packet was sent. Additional checks have been adedd. Error checking the response for writes has been added so that it reports error codes.
add 58827f9 Merge pull request #192 from hutcheb/RefactorFieldHandler
add 9af17c2 Add an OPC UA Server
add f4f9bdf Added requirement to set the security dir Otherwise it will create a security dir in the working dir.
add 2682f46 Add OPC UA Server to plc4x poms Added a with-opcua-server option. Used the projects dependancy versions. Split out the Plc4x comms logic into it's one files so they aren't mixed up in the OPC UA server logic. Added an outline for the OPC UA Server README file
add 5a24d98 Played around with specifying the data type. We should be able to use a base data type in opc ua as we do all the conversions already in Plcx. Handling of Arrays could be better by creating a node for each item in the array.
add f65c2aa Updated the handling of the passwords Passwords are entered on startup if they don't exist and then saved to the config file. They still need to be encrypted.
add 9de9e7c Update README.adoc
add cc303a2 Merge branch 'Feature/opcua-server' of https://github.com/hutcheb/plc4x into Feature/opcua-server
add 25df18f Bumped the OPCUA driver version of Milo. Also went ot he latest stable build 5.1 instead of 5.2-snapshot for the opcua server.
add b6aa1d0 Merge pull request #194 from hutcheb/Feature/opcua-server
add 2788dc4 add logo record evolution
add e3a87b7 Added Record Evolution
add a3ae0a1 Delete logo_record_evolution_single_dark_bgfont.svg
add 9d272f8 Add record evolution logo as png
add 7d5eb73 changed record evolution logo to png
add bf6ac83 Brief support for AMS/ADS discovery packets.
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 (ed3fa8d)
\
N -- N -- N refs/heads/feature/beckhoff-discovery (bf6ac83)
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:
.../language/java/JavaLanguageTemplateHelper.java | 16 +-
.../resources/templates/java/data-io-template.ftlh | 14 +-
.../org/apache/plc4x/java/api/model/PlcField.java | 16 +
.../org/apache/plc4x/java/api/value/PlcBOOL.java | 14 +-
.../org/apache/plc4x/java/api/value/PlcBYTE.java | 118 +-
.../org/apache/plc4x/java/api/value/PlcCHAR.java | 111 +-
.../org/apache/plc4x/java/api/value/PlcDINT.java | 5 -
.../org/apache/plc4x/java/api/value/PlcDWORD.java | 118 +-
.../org/apache/plc4x/java/api/value/PlcINT.java | 5 -
.../org/apache/plc4x/java/api/value/PlcLINT.java | 5 -
.../org/apache/plc4x/java/api/value/PlcLREAL.java | 5 -
.../org/apache/plc4x/java/api/value/PlcLWORD.java | 118 +-
.../org/apache/plc4x/java/api/value/PlcREAL.java | 5 -
.../org/apache/plc4x/java/api/value/PlcSINT.java | 5 -
.../org/apache/plc4x/java/api/value/PlcString.java | 6 +
.../org/apache/plc4x/java/api/value/PlcUDINT.java | 5 -
.../org/apache/plc4x/java/api/value/PlcUINT.java | 5 -
.../org/apache/plc4x/java/api/value/PlcULINT.java | 5 -
.../org/apache/plc4x/java/api/value/PlcUSINT.java | 5 -
.../org/apache/plc4x/java/api/value/PlcValues.java | 123 +-
.../org/apache/plc4x/java/api/value/PlcWCHAR.java | 109 +-
.../org/apache/plc4x/java/api/value/PlcWORD.java | 118 +-
.../apache/plc4x/java/abeth/field/AbEthField.java | 5 +
.../plc4x/java/ads/field/AdsFieldHandler.java | 1063 -----------
.../plc4x/java/ads/field/DirectAdsField.java | 5 +
.../plc4x/java/ads/field/SymbolicAdsField.java | 5 +
.../plc4x/java/eip/readwrite/field/EipField.java | 5 +
.../java/eip/readwrite/field/EipFieldHandler.java | 393 +---
.../readwrite/field/FirmataFieldAnalog.java | 5 +
.../readwrite/field/FirmataFieldDigital.java | 5 +
.../readwrite/field/FirmataFieldHandler.java | 104 -
.../plc4x/java/knxnetip/field/KnxNetIpField.java | 5 +
.../java/knxnetip/field/KnxNetIpFieldHandler.java | 80 -
.../plc4x/java/knxnetip/utils/KnxHelper.java | 11 +-
.../apache/plc4x/java/mock/field/MockField.java | 5 +
.../plc4x/java/modbus/field/ModbusField.java | 5 +
.../java/modbus/field/ModbusFieldHandler.java | 1839 ------------------
.../java/modbus/protocol/ModbusProtocolLogic.java | 337 +---
.../apache/plc4x/java/modbus/ModbusEncodeTest.java | 13 +-
plc4j/drivers/opcua/pom.xml | 4 -
.../opcua/connection/OpcuaTcpPlcConnection.java | 2 +-
.../plc4x/java/opcua/protocol/OpcuaField.java | 5 +
.../java/opcua/protocol/OpcuaPlcFieldHandler.java | 114 --
.../plc4x/java/opcua/OpcuaPlcDriverTest.java | 2 +-
.../plc4x/java/s7/readwrite/field/S7Field.java | 4 +
.../java/s7/readwrite/field/S7PlcFieldHandler.java | 511 -----
.../plc4x/java/simulated/field/SimulatedField.java | 4 +
.../simulated/field/SimulatedFieldHandler.java | 121 +-
.../simulated/field/SimularedFieldHandlerTest.java | 19 +-
.../examples/helloplc4x/write/HelloPlc4xWrite.java | 8 +-
.../spi/connection/DefaultPlcFieldHandler.java | 1991 +++++++++++++++++++-
.../plc4x/java/spi/generation/WriteBuffer.java | 65 +-
.../java/opm/PlcEntityManagerComplexTest.java | 5 +-
pom.xml | 34 +-
sandbox/opcua-server/README.adoc | 98 +
sandbox/opcua-server/pom.xml | 216 +++
.../java/opcuaserver/AttributeLoggingFilter.java | 73 +
.../plc4x/java/opcuaserver/Configuration.java | 126 ++
.../java/opcuaserver/DeviceConfiguration.java | 35 +-
.../plc4x/java/opcuaserver/KeyStoreLoader.java | 163 ++
.../apache/plc4x/java/opcuaserver/OPCUAServer.java | 334 ++++
.../java/opcuaserver/RestrictedAccessFilter.java | 55 +
.../org/apache/plc4x/java/opcuaserver/Tag.java | 27 +-
.../opcuaserver/backend/Plc4xCommunication.java | 177 ++
.../java/opcuaserver/backend/Plc4xNamespace.java | 215 +++
sandbox/opcua-server/src/main/resources/config.yml | 43 +
.../src/main/resources/logback.xml | 4 +-
.../org/apache/plc4x/java/opcuaserver/AppTest.java | 21 +-
sandbox/pom.xml | 10 +-
src/site/asciidoc/users/adopters.adoc | 3 +
.../asciidoc/users/blogs-videos-and-slides.adoc | 3 +
src/site/asciidoc/users/protocols/modbus.adoc | 1 +
.../logo_record_evolution_single_dark_bgfont.png | Bin 0 -> 10498 bytes
73 files changed, 4653 insertions(+), 4656 deletions(-)
create mode 100644 sandbox/opcua-server/README.adoc
create mode 100644 sandbox/opcua-server/pom.xml
create mode 100644 sandbox/opcua-server/src/main/java/org/apache/plc4x/java/opcuaserver/AttributeLoggingFilter.java
create mode 100644 sandbox/opcua-server/src/main/java/org/apache/plc4x/java/opcuaserver/Configuration.java
copy plc4j/api/src/test/java/org/apache/plc4x/java/api/messages/PlcSubscriptionResponseTest.java => sandbox/opcua-server/src/main/java/org/apache/plc4x/java/opcuaserver/DeviceConfiguration.java (62%)
create mode 100644 sandbox/opcua-server/src/main/java/org/apache/plc4x/java/opcuaserver/KeyStoreLoader.java
create mode 100644 sandbox/opcua-server/src/main/java/org/apache/plc4x/java/opcuaserver/OPCUAServer.java
create mode 100644 sandbox/opcua-server/src/main/java/org/apache/plc4x/java/opcuaserver/RestrictedAccessFilter.java
copy plc4j/tools/scraper/src/main/java/org/apache/plc4x/java/scraper/config/JobConfiguration.java => sandbox/opcua-server/src/main/java/org/apache/plc4x/java/opcuaserver/Tag.java (70%)
create mode 100644 sandbox/opcua-server/src/main/java/org/apache/plc4x/java/opcuaserver/backend/Plc4xCommunication.java
create mode 100644 sandbox/opcua-server/src/main/java/org/apache/plc4x/java/opcuaserver/backend/Plc4xNamespace.java
create mode 100644 sandbox/opcua-server/src/main/resources/config.yml
copy sandbox/{hello-influx-data-collection => opcua-server}/src/main/resources/logback.xml (97%)
copy plc4j/api/src/test/java/org/apache/plc4x/java/api/exceptions/PlcFieldRangeExceptionTest.java => sandbox/opcua-server/src/test/java/org/apache/plc4x/java/opcuaserver/AppTest.java (77%)
create mode 100644 src/site/resources/images/users/companies/logo_record_evolution_single_dark_bgfont.png