You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@plc4x.apache.org by cd...@apache.org on 2020/05/22 13:32:01 UTC
[plc4x] branch develop updated (e5d95cf -> b027126)
This is an automated email from the ASF dual-hosted git repository.
cdutz pushed a change to branch develop
in repository https://gitbox.apache.org/repos/asf/plc4x.git.
from e5d95cf - Fixed the parent version of the pom
add 92352ee - Moved some of the code from the simulator to the S7 driver - Added a skeleton for the S7 driver to the new generated s7 driver - Removed the code-generation from the plc-simulator module - Refactored the S7Server to use the code of the driver instead
add 1379478 - Added inputs and outputs to the context - Refactored the Simulator and Server APIs - Made the WaterTankSimulationModule do something a little more complicated
add f27cef0 - Made data be transported in "byte" instead of "short" arrays. - Changed the PLCSimulator to only run with one selected simulation (Due to the problem of how to map I/O to the different simulations)
add b756712 - Continued implemting the functionality to read DBs in the simulator
add d9c4d11 Rebased on current develop + fixed some issues to get a running version again.
add b027126 - Explicitly set the _allow_illegal_access_reflection_in_tests profile to disabled to skip the detection on the site build node
No new revisions were added by this update.
Summary of changes:
Jenkinsfile | 5 +-
.../connection/GeneratedProtocolMessageCodec.java | 2 +-
sandbox/plc-simulator/pom.xml | 19 +++
.../org/apache/plc4x/simulator/PlcSimulator.java | 57 +++++----
.../simulator/exceptions/SimulatorExcepiton.java | 12 +-
.../org/apache/plc4x/simulator/model/Context.java | 112 ++++++++++++++++++
.../plc4x/simulator/server/ServerModule.java | 9 +-
.../apache/plc4x/simulator/server/s7/S7Server.java | 69 -----------
.../plc4x/simulator/server/s7/S7ServerModule.java | 72 ++++++++++--
...rverProtocol.java => S7Step7ServerAdapter.java} | 128 ++++++++++++++++++---
.../simulator/simulation/SimulationModule.java | 5 +-
.../watertank/WaterTankSimulationModule.java | 65 +++++++++--
.../java/org/apache/plc4x/java/s7/S7PlcDriver.java | 34 +++---
.../plc4x/java/s7/connection/S7PlcConnection.java | 101 ++++++++++++++++
.../java/s7/protocol/S7Step7ClientAdapter.java | 23 ++--
.../java/s7/protocol/S7Step7Plc4xAdapter.java | 23 ++--
.../plc4x/java}/s7/protocol/S7Step7Protocol.java | 2 +-
.../services/org.apache.plc4x.java.spi.PlcDriver | 2 +-
18 files changed, 565 insertions(+), 175 deletions(-)
copy plc4j/integrations/apache-kafka/src/main/java/org/apache/plc4x/kafka/exceptions/ConfigurationException.java => sandbox/plc-simulator/src/main/java/org/apache/plc4x/simulator/exceptions/SimulatorExcepiton.java (74%)
create mode 100644 sandbox/plc-simulator/src/main/java/org/apache/plc4x/simulator/model/Context.java
delete mode 100644 sandbox/plc-simulator/src/main/java/org/apache/plc4x/simulator/server/s7/S7Server.java
rename sandbox/plc-simulator/src/main/java/org/apache/plc4x/simulator/server/s7/protocol/{S7Step7ServerProtocol.java => S7Step7ServerAdapter.java} (59%)
copy plc4j/examples/dummy-driver/src/main/java/org/apache/plc4x/java/examples/dummydriver/DummyDriver.java => sandbox/test-java-s7-driver/src/main/java/org/apache/plc4x/java/s7/S7PlcDriver.java (56%)
create mode 100644 sandbox/test-java-s7-driver/src/main/java/org/apache/plc4x/java/s7/connection/S7PlcConnection.java
copy plc4j/transports/udp/src/main/java/org/apache/plc4x/java/transport/udp/protocol/DatagramUnpackingHandler.java => sandbox/test-java-s7-driver/src/main/java/org/apache/plc4x/java/s7/protocol/S7Step7ClientAdapter.java (60%)
copy plc4j/transports/udp/src/main/java/org/apache/plc4x/java/transport/udp/protocol/DatagramUnpackingHandler.java => sandbox/test-java-s7-driver/src/main/java/org/apache/plc4x/java/s7/protocol/S7Step7Plc4xAdapter.java (60%)
rename sandbox/{plc-simulator/src/main/java/org/apache/plc4x/simulator/server => test-java-s7-driver/src/main/java/org/apache/plc4x/java}/s7/protocol/S7Step7Protocol.java (98%)
copy plc4j/integrations/apache-camel/src/test/resources/META-INF/services/org.apache.plc4x.java.api.PlcDriver => sandbox/test-java-s7-driver/src/main/resources/META-INF/services/org.apache.plc4x.java.spi.PlcDriver (95%)