This is an automated email from the ASF dual-hosted git repository.
chrisdutz pushed a change to branch refactor/spi3
in repository https://gitbox.apache.org/repos/asf/plc4x.git
from e62d55fc44 refactor: Refactored the Can-related drivers to the new SPI.
add a543402eb1 refactor: Refactored the AB-Eth and C-Bus drivers to the
new SPI.
No new revisions were added by this update.
Summary of changes:
plc4j/drivers/ab-eth/pom.xml | 46 ++-
.../CIPEncapsulationConnectionRequest.java | 4 +-
.../CIPEncapsulationConnectionResponse.java | 4 +-
.../abeth/readwrite/CIPEncapsulationPacket.java | 28 +-
.../readwrite/CIPEncapsulationReadRequest.java | 8 +-
.../readwrite/CIPEncapsulationReadResponse.java | 8 +-
.../abeth/readwrite/DF1CommandRequestMessage.java | 9 +-
...ndResponseMessageProtectedTypedLogicalRead.java | 9 +-
.../java/abeth/readwrite/DF1RequestCommand.java | 9 +-
.../java/abeth/readwrite/DF1RequestMessage.java | 25 +-
.../DF1RequestProtectedTypedLogicalRead.java | 25 +-
.../java/abeth/readwrite/DF1ResponseMessage.java | 25 +-
.../apache/plc4x/java/abeth/AbEthConnection.java | 386 +++++++++++++++++++++
.../org/apache/plc4x/java/abeth/AbEthDriver.java | 76 ++--
.../apache/plc4x/java/abeth/AbEthMessageCodec.java | 91 +++++
.../abeth/configuration/AbEthConfiguration.java | 27 +-
.../AbEthTcpTransportConfiguration.java | 5 +-
.../java/abeth/protocol/AbEthProtocolLogic.java | 217 ------------
.../java/abeth/protocol/Plc4xAbEthProtocol.java | 247 -------------
.../plc4x/java/abeth/tag/AbEthTagHandler.java | 4 +-
.../protocol/abeth/AbEthParserSerializerTest.java | 2 +-
plc4j/drivers/c-bus/pom.xml | 59 +++-
.../apache/plc4x/java/cbus/readwrite/Alpha.java | 9 +-
.../java/cbus/readwrite/ApplicationAddress1.java | 11 +-
.../java/cbus/readwrite/ApplicationAddress2.java | 11 +-
.../plc4x/java/cbus/readwrite/BridgeAddress.java | 9 +-
.../apache/plc4x/java/cbus/readwrite/CALData.java | 17 +-
.../java/cbus/readwrite/CALDataAcknowledge.java | 13 +-
.../java/cbus/readwrite/CALDataGetStatus.java | 13 +-
.../plc4x/java/cbus/readwrite/CALDataIdentify.java | 9 +-
.../java/cbus/readwrite/CALDataIdentifyReply.java | 13 +-
.../plc4x/java/cbus/readwrite/CALDataRecall.java | 13 +-
.../plc4x/java/cbus/readwrite/CALDataReply.java | 13 +-
.../plc4x/java/cbus/readwrite/CALDataReset.java | 5 +-
.../plc4x/java/cbus/readwrite/CALDataStatus.java | 17 +-
.../java/cbus/readwrite/CALDataStatusExtended.java | 29 +-
.../plc4x/java/cbus/readwrite/CALDataWrite.java | 17 +-
.../apache/plc4x/java/cbus/readwrite/CALReply.java | 11 +-
.../plc4x/java/cbus/readwrite/CALReplyLong.java | 29 +-
.../plc4x/java/cbus/readwrite/CALReplyShort.java | 5 +-
.../plc4x/java/cbus/readwrite/CBusCommand.java | 13 +-
.../readwrite/CBusCommandDeviceManagement.java | 17 +-
.../readwrite/CBusCommandPointToMultiPoint.java | 9 +-
.../cbus/readwrite/CBusCommandPointToPoint.java | 9 +-
.../CBusCommandPointToPointToMultiPoint.java | 9 +-
.../plc4x/java/cbus/readwrite/CBusHeader.java | 21 +-
.../plc4x/java/cbus/readwrite/CBusMessage.java | 5 +-
.../java/cbus/readwrite/CBusMessageToClient.java | 9 +-
.../java/cbus/readwrite/CBusMessageToServer.java | 9 +-
.../plc4x/java/cbus/readwrite/CBusOptions.java | 41 +--
.../readwrite/CBusPointToMultiPointCommand.java | 7 +-
.../CBusPointToMultiPointCommandNormal.java | 13 +-
.../CBusPointToMultiPointCommandStatus.java | 9 +-
.../cbus/readwrite/CBusPointToPointCommand.java | 13 +-
.../readwrite/CBusPointToPointCommandDirect.java | 9 +-
.../readwrite/CBusPointToPointCommandIndirect.java | 17 +-
.../CBusPointToPointToMultiPointCommand.java | 15 +-
.../CBusPointToPointToMultiPointCommandNormal.java | 13 +-
.../CBusPointToPointToMultiPointCommandStatus.java | 9 +-
.../apache/plc4x/java/cbus/readwrite/Checksum.java | 9 +-
.../plc4x/java/cbus/readwrite/Confirmation.java | 19 +-
.../java/cbus/readwrite/CustomManufacturer.java | 9 +-
.../plc4x/java/cbus/readwrite/CustomTypes.java | 9 +-
.../plc4x/java/cbus/readwrite/EncodedReply.java | 9 +-
.../java/cbus/readwrite/EncodedReplyCALReply.java | 9 +-
.../java/cbus/readwrite/IdentifyReplyCommand.java | 5 +-
.../IdentifyReplyCommandCurrentSenseLevels.java | 9 +-
.../readwrite/IdentifyReplyCommandDSIStatus.java | 45 +--
.../cbus/readwrite/IdentifyReplyCommandDelays.java | 13 +-
...ntifyReplyCommandExtendedDiagnosticSummary.java | 83 ++---
.../IdentifyReplyCommandFirmwareVersion.java | 9 +-
.../IdentifyReplyCommandGAVPhysicalAddresses.java | 9 +-
.../IdentifyReplyCommandGAVValuesCurrent.java | 9 +-
.../IdentifyReplyCommandGAVValuesStored.java | 9 +-
.../IdentifyReplyCommandLogicalAssignment.java | 9 +-
.../IdentifyReplyCommandManufacturer.java | 9 +-
.../IdentifyReplyCommandMaximumLevels.java | 9 +-
.../IdentifyReplyCommandMinimumLevels.java | 9 +-
.../IdentifyReplyCommandNetworkTerminalLevels.java | 9 +-
.../IdentifyReplyCommandNetworkVoltage.java | 21 +-
.../IdentifyReplyCommandOutputUnitSummary.java | 21 +-
.../readwrite/IdentifyReplyCommandSummary.java | 17 +-
.../IdentifyReplyCommandTerminalLevels.java | 9 +-
.../cbus/readwrite/IdentifyReplyCommandType.java | 9 +-
.../readwrite/IdentifyReplyCommandUnitSummary.java | 37 +-
.../java/cbus/readwrite/InterfaceOptions1.java | 29 +-
.../InterfaceOptions1PowerUpSettings.java | 9 +-
.../java/cbus/readwrite/InterfaceOptions2.java | 13 +-
.../java/cbus/readwrite/InterfaceOptions3.java | 21 +-
.../java/cbus/readwrite/LevelInformation.java | 23 +-
.../cbus/readwrite/LevelInformationAbsent.java | 5 +-
.../cbus/readwrite/LevelInformationCorrupted.java | 21 +-
.../cbus/readwrite/LevelInformationNormal.java | 17 +-
.../plc4x/java/cbus/readwrite/LogicAssignment.java | 29 +-
.../plc4x/java/cbus/readwrite/MonitoredSAL.java | 7 +-
.../readwrite/MonitoredSALLongFormSmartMode.java | 33 +-
.../java/cbus/readwrite/MonitoredSALReply.java | 9 +-
.../readwrite/MonitoredSALShortFormBasicMode.java | 27 +-
.../NetworkProtocolControlInformation.java | 13 +-
.../plc4x/java/cbus/readwrite/NetworkRoute.java | 13 +-
.../plc4x/java/cbus/readwrite/ParameterChange.java | 13 +-
.../java/cbus/readwrite/ParameterChangeReply.java | 9 +-
.../plc4x/java/cbus/readwrite/ParameterValue.java | 5 +-
.../ParameterValueApplicationAddress1.java | 13 +-
.../ParameterValueApplicationAddress2.java | 13 +-
.../readwrite/ParameterValueBaudRateSelector.java | 13 +-
.../ParameterValueCustomManufacturer.java | 9 +-
.../cbus/readwrite/ParameterValueCustomTypes.java | 9 +-
.../readwrite/ParameterValueInterfaceOptions1.java | 13 +-
...meterValueInterfaceOptions1PowerUpSettings.java | 9 +-
.../readwrite/ParameterValueInterfaceOptions2.java | 13 +-
.../readwrite/ParameterValueInterfaceOptions3.java | 13 +-
.../java/cbus/readwrite/ParameterValueRaw.java | 9 +-
.../cbus/readwrite/ParameterValueSerialNumber.java | 13 +-
.../apache/plc4x/java/cbus/readwrite/PowerUp.java | 13 +-
.../plc4x/java/cbus/readwrite/PowerUpReply.java | 9 +-
.../apache/plc4x/java/cbus/readwrite/Reply.java | 7 +-
.../java/cbus/readwrite/ReplyEncodedReply.java | 17 +-
.../plc4x/java/cbus/readwrite/ReplyNetwork.java | 13 +-
.../java/cbus/readwrite/ReplyOrConfirmation.java | 9 +-
.../readwrite/ReplyOrConfirmationConfirmation.java | 13 +-
.../cbus/readwrite/ReplyOrConfirmationReply.java | 13 +-
.../apache/plc4x/java/cbus/readwrite/Request.java | 23 +-
.../plc4x/java/cbus/readwrite/RequestCommand.java | 25 +-
.../plc4x/java/cbus/readwrite/RequestContext.java | 9 +-
.../cbus/readwrite/RequestDirectCommandAccess.java | 19 +-
.../plc4x/java/cbus/readwrite/RequestEmpty.java | 5 +-
.../plc4x/java/cbus/readwrite/RequestNull.java | 9 +-
.../plc4x/java/cbus/readwrite/RequestObsolete.java | 15 +-
.../plc4x/java/cbus/readwrite/RequestReset.java | 17 +-
.../readwrite/RequestSmartConnectShortcut.java | 15 +-
.../java/cbus/readwrite/RequestTermination.java | 9 +-
.../java/cbus/readwrite/ResponseTermination.java | 13 +-
.../apache/plc4x/java/cbus/readwrite/SALData.java | 9 +-
.../java/cbus/readwrite/SALDataAccessControl.java | 9 +-
.../cbus/readwrite/SALDataAirConditioning.java | 9 +-
.../java/cbus/readwrite/SALDataAudioAndVideo.java | 9 +-
.../cbus/readwrite/SALDataClockAndTimekeeping.java | 9 +-
.../java/cbus/readwrite/SALDataEnableControl.java | 9 +-
.../java/cbus/readwrite/SALDataErrorReporting.java | 9 +-
.../java/cbus/readwrite/SALDataFreeUsage.java | 5 +-
.../plc4x/java/cbus/readwrite/SALDataHeating.java | 9 +-
.../java/cbus/readwrite/SALDataHvacActuator.java | 9 +-
.../cbus/readwrite/SALDataIrrigationControl.java | 9 +-
.../plc4x/java/cbus/readwrite/SALDataLighting.java | 9 +-
.../java/cbus/readwrite/SALDataMeasurement.java | 9 +-
.../java/cbus/readwrite/SALDataMediaTransport.java | 9 +-
.../plc4x/java/cbus/readwrite/SALDataMetering.java | 9 +-
.../SALDataPoolsSpasPondsFountainsControl.java | 9 +-
.../plc4x/java/cbus/readwrite/SALDataReserved.java | 5 +-
.../cbus/readwrite/SALDataRoomControlSystem.java | 5 +-
.../plc4x/java/cbus/readwrite/SALDataSecurity.java | 9 +-
.../SALDataTelephonyStatusAndControl.java | 9 +-
.../readwrite/SALDataTemperatureBroadcast.java | 9 +-
.../plc4x/java/cbus/readwrite/SALDataTesting.java | 5 +-
.../java/cbus/readwrite/SALDataTriggerControl.java | 9 +-
.../java/cbus/readwrite/SALDataVentilation.java | 9 +-
.../cbus/readwrite/SerialInterfaceAddress.java | 9 +-
.../plc4x/java/cbus/readwrite/SerialNumber.java | 21 +-
.../java/cbus/readwrite/ServerErrorReply.java | 9 +-
.../plc4x/java/cbus/readwrite/StatusByte.java | 21 +-
.../plc4x/java/cbus/readwrite/StatusRequest.java | 7 +-
.../cbus/readwrite/StatusRequestBinaryState.java | 9 +-
.../StatusRequestBinaryStateDeprecated.java | 9 +-
.../java/cbus/readwrite/StatusRequestLevel.java | 13 +-
.../plc4x/java/cbus/readwrite/UnitAddress.java | 9 +-
.../org/apache/plc4x/java/cbus/CBusConnection.java | 105 ++++++
.../org/apache/plc4x/java/cbus/CBusDriver.java | 101 ++----
.../apache/plc4x/java/cbus/CBusMessageCodec.java | 89 +++++
.../java/cbus/configuration/CBusConfiguration.java | 14 +-
.../CBusTcpTransportConfiguration.java | 4 +-
.../plc4x/java/cbus/context/CBusDriverContext.java | 31 --
.../java/cbus/protocol/CBusProtocolLogic.java | 81 -----
.../java/cbus/readwrite/utils/StaticHelper.java | 157 +++++----
.../java/cbus/readwrite/utils/StaticHelper.java | 312 -----------------
.../apache/plc4x/java/cbus/RandomPackagesTest.java | 6 +-
.../org/apache/plc4x/java/cbus/ReferenceTest.java | 2 +-
.../test/java/org/apache/plc4x/java/cbus/Util.java | 6 +-
.../main/resources/protocols/abeth/ab-eth.mspec | 8 +-
.../src/main/resources/protocols/cbus/c-bus.mspec | 90 ++---
180 files changed, 2094 insertions(+), 2114 deletions(-)
create mode 100644
plc4j/drivers/ab-eth/src/main/java/org/apache/plc4x/java/abeth/AbEthConnection.java
create mode 100644
plc4j/drivers/ab-eth/src/main/java/org/apache/plc4x/java/abeth/AbEthMessageCodec.java
delete mode 100644
plc4j/drivers/ab-eth/src/main/java/org/apache/plc4x/java/abeth/protocol/AbEthProtocolLogic.java
delete mode 100644
plc4j/drivers/ab-eth/src/main/java/org/apache/plc4x/java/abeth/protocol/Plc4xAbEthProtocol.java
create mode 100644
plc4j/drivers/c-bus/src/main/java/org/apache/plc4x/java/cbus/CBusConnection.java
create mode 100644
plc4j/drivers/c-bus/src/main/java/org/apache/plc4x/java/cbus/CBusMessageCodec.java
delete mode 100644
plc4j/drivers/c-bus/src/main/java/org/apache/plc4x/java/cbus/context/CBusDriverContext.java
delete mode 100644
plc4j/drivers/c-bus/src/main/java/org/apache/plc4x/java/cbus/protocol/CBusProtocolLogic.java
delete mode 100644
plc4j/drivers/c-bus/src/main/temp/org/apache/plc4x/java/cbus/readwrite/utils/StaticHelper.java
