Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Issue 701 #776

Open
wants to merge 17 commits into
base: develop
Choose a base branch
from
Open

Issue 701 #776

wants to merge 17 commits into from

Conversation

glcj
Copy link
Contributor

@glcj glcj commented Feb 1, 2023

hi,

Implements the fix for issue-701.
The driver did not allow writing binaries on S7-400 computers.
For the S7-400 it is not required that the last writing element generate the padding. The S7-1500 for example does not take it into account.

ceos01 and others added 17 commits January 28, 2023 12:50
Bumps [equalsverifier](https://github.com/jqno/equalsverifier) from 3.12.3 to 3.12.4.
- [Release notes](https://github.com/jqno/equalsverifier/releases)
- [Changelog](https://github.com/jqno/equalsverifier/blob/main/CHANGELOG.md)
- [Commits](jqno/equalsverifier@equalsverifier-3.12.3...equalsverifier-3.12.4)

---
updated-dependencies:
- dependency-name: nl.jqno.equalsverifier:equalsverifier
  depen
"One downside to Google's approach is that all of your functions must have a new first argument, but after clearing that hurdle everything else is much better.
If you aren't interested in this warning, read on."dency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Bumps `jackson.version` from 2.14.1 to 2.14.2.

Updates `jackson-annotations` from 2.14.1 to 2.14.2
- [Release notes](https://github.com/FasterXML/jackson/releases)
- [Commits](https://github.com/FasterXML/jackson/commits)

Updates `jackson-core` from 2.14.1 to 2.14.2
- [Release notes](https://github.com/FasterXML/jackson-core/releases)
- [Commits](FasterXML/jackson-core@jackson-core-2.14.1...jackson-core-2.14.2)

Updates `jackson-databind` from 2.14.1 to 2.14.2
- [Release notes](https://github.com/FasterXML/jackson/releases)
- [Commits](https://github.com/FasterXML/jackson/commits)

Updates `jackson-dataformat-xml` from 2.14.1 to 2.14.2
- [Release notes](https://github.com/FasterXML/jackson-dataformat-xml/releases)
- [Commits](FasterXML/jackson-dataformat-xml@jackson-dataformat-xml-2.14.1...jackson-dataformat-xml-2.14.2)

Updates `jackson-dataformat-yaml` from 2.14.1 to 2.14.2
- [Release notes](https://github.com/FasterXML/jackson-dataformats-text/releases)
- [Commits](FasterXML/jackson-dataformats-text@jackson-dataformats-text-2.14.1...jackson-dataformats-text-2.14.2)

---
updated-dependencies:
- dependency-name: com.fasterxml.jackson.core:jackson-annotations
  dependency-type: direct:production
  update-type: version-update:semver-patch
- dependency-name: com.fasterxml.jackson.core:jackson-core
  dependency-type: direct:production
  update-type: version-update:semver-patch
- dependency-name: com.fasterxml.jackson.core:jackson-databind
  dependency-type: direct:development
  update-type: version-update:semver-patch
- dependency-name: com.fasterxml.jackson.dataformat:jackson-dataformat-xml
  dependency-type: direct:production
  update-type: version-update:semver-patch
- dependency-name: com.fasterxml.jackson.dataformat:jackson-dataformat-yaml
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Bumps `mockito.version` from 5.0.0 to 5.1.0.

Updates `mockito-core` from 5.0.0 to 5.1.0
- [Release notes](https://github.com/mockito/mockito/releases)
- [Commits](mockito/mockito@v5.0.0...v5.1.0)

Updates `mockito-junit-jupiter` from 5.0.0 to 5.1.0
- [Release notes](https://github.com/mockito/mockito/releases)
- [Commits](mockito/mockito@v5.0.0...v5.1.0)

---
updated-dependencies:
- dependency-name: org.mockito:mockito-core
  dependency-type: direct:production
  update-type: version-update:semver-minor
- dependency-name: org.mockito:mockito-junit-jupiter
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
* fix(plc4j/profinet): Fix to remove spaces from the generated connection string.

* fix(plc4j(profinet): Connections are working for my setup

* fix(plc4j(profinet): Add Dummy Advanced Connection Write Request

* fix(plc4j(profinet): Started to add the LLDP broadcast

* fix(plc4j(profinet): Continued to add the LLDP broadcast

* fix(plc4j(profinet): Finished the connection setup.

* feat(plc4j/profinet): Fixed a few minor issues and added the Application Ready packet

* feat(plc4j/profinet): Escape spaces using %20

* feat(plc4j/): split out dcp and lldp tasks, so they can be processed separately.

* fix(plc4j/profinet): Identified that the Application Ready request comes from the device.

* fix(plc4j/profinet): Cleaned up the message send and receive interface

* chore(plc4j/profinet): escape the device name and type within the connection string

* fix(plc4j/profinet): Continued to split device logic out.

* feat(plc4j/profinet): Add outline of GSDML parser.

* feat(plc4j/profinet): Finished major components of parser

* feat(plc4j/profinet): Add External text Data

* feat(plc4j/profinet): Generated Getters

* feat(plc4j/profinet): Add Dummy GSDML file

* feat(plc4j/profinet): Added basic test case

* feat(plc4j/profinet): Add GSD directory Configuration Parameter and cleaned up device parameter

* feat(plc4j/profinet): Standardize the mac address key to uppercase

* feat(plc4j/profinet): Need to Review the UDP checksum field.

* feat(plc4j/profinet): Add dummy checksum field in IPv4 packets

* feat(plc4j/profinet): Mistake leaving request as a response in mspec

* feat(plc4j/profinet): Add reading gsd directory and starting to add support for optional submodules.

* feat(plc4j/profinet): Splitting out connection request, using default config from gsd file.

* feat(plc4j/profinet): Realised that the pcap promiscuous mode handles don't play nicely with other connections.

* feat(plc4j/profinet): Add support for UDP packets, this allows us to use the same channel to receive all packets.

* feat(plc4j/profinet): Fixed parsing of PnIo_CyclicServiceDataUnit into an array of bytes. This needs to be parsed into the format from the gsd file.

* feat(plc4j/profinet): Cleaned up a little and added the IODataObject to the cyclic write packets.

* feat(plc4j/profinet): Started to add the submodules to the configuration.

* feat(plc4j/profinet): Add support for optional modules in the connection packet, still need to add support within the write parameters packet.

* feat(plc4j/profinet): Add support for writing records during startup

* feat(plc4j/profinet): Add datahold factor to configuration

* fix(plc4j/profinet): Fix failing tests

* feat(plc4j/profinet): Started to add the browse functionality, which is need to get a list of available tags.

* feat(plc4j/profinet): Add more browse functionality.

* feat(plc4j/profinet): Started to standardize the way the GSD file is queried.

* feat(plc4j/profinet): Updated the parsing of the submodule connection string section

* feat(plc4j/profinet): Fixed the cyclic comms after refactoring for tag browsing

* feat(plc4j/profinet): add metadata to browse tags

* fix(plc4j/profinet): Fix issues after merging develop

* fix(plc4j/profinet): Finished removing the BaseConfiguration class, the local ip address is now taken from the channel config.

* fix(plc4j/profinet): fix dependency check and remove manual test

* fix(plc4j/profinet): fix disabled test for gsdfiles

* fix(plc4j/profinet): Add support for checking if a submodule is found in the list of usable modules.

* fix(plc4j/profinet): update tests for browsing

* fix(plc4j/profinet): Continued filling out the browse structure.

* fix(plc4j/profinet): Minor change to support older Java versions

* fix(plc4j/profinet): Refactoring the configuration to allow for an easier initialization of devices.

* fix(plc4j/profinet): Refactoring the configuration to allow for an easier initialization of devices.

* fix(plc4j/profinet): Refactoring the submodules, this stops us from having to repeatedly querying the gsd file directly.

* fix(plc4j/profinet): Continue refactoring

* fix(readme): Flattening the tags returned by browsing.

* fix(plc4j/profinet): Expanded supported data types.

* fix(plc4j/profinet): Add extra tests for browsing tags

* fix(plc4j/profinet): Fix issues after refactoring.

* fix(plc4j/profinet): Add support for parsing returned data as well as routing cyclic data to device handler.

* fix(plc4j/profinet): Add the subscription logic.

* fix(plc4j/profinet): Starting to add error handling cases

* fix(plc4j/profinet): Fixed issue with cycle timer as well as included auto re-connect on failed connection. Also updated the documentation.

* fix(plc4j/profinet): Fixed up some files that were changed accidentally

* fix(plc4j): don't exclude the template folder in .idea

* fix(plc4j/profinet): update manual profinet test

* fix(plc4j/profinet): Cleaned up and changed to using states for each device

* fix(plc4j/profinet): Fixing exception handling.

* fix(plc4j/profinet): Cleaned up a little

* fix(plc4j/profinet): Add support for individual subscriptions and change of state subscriptions

* fix(plc4j/profinet): Fixed issue with non bit data values and browse response

* fix(plc4j/profinet): Merged Develop and updated generated classes
Bumps `mockito.version` from 5.1.0 to 5.1.1.

Updates `mockito-core` from 5.1.0 to 5.1.1
- [Release notes](https://github.com/mockito/mockito/releases)
- [Commits](mockito/mockito@v5.1.0...v5.1.1)

Updates `mockito-junit-jupiter` from 5.1.0 to 5.1.1
- [Release notes](https://github.com/mockito/mockito/releases)
- [Commits](mockito/mockito@v5.1.0...v5.1.1)

---
updated-dependencies:
- dependency-name: org.mockito:mockito-core
  dependency-type: direct:production
  update-type: version-update:semver-patch
- dependency-name: org.mockito:mockito-junit-jupiter
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
@chrisdutz
Copy link
Contributor

What's the state of this?

@ottlukas ottlukas added java Pull requests that update Java code S7 https://plc4x.apache.org/users/protocols/s7.html awaiting-feedback This label is applied when an issue has been opened and we need more information from the issuer. labels Jul 5, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
awaiting-feedback This label is applied when an issue has been opened and we need more information from the issuer. java Pull requests that update Java code S7 https://plc4x.apache.org/users/protocols/s7.html
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants