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

Merge Freeze to Develop #131

Merged
merged 40 commits into from
Jun 3, 2024
Merged

Merge Freeze to Develop #131

merged 40 commits into from
Jun 3, 2024

Conversation

azoitl
Copy link
Contributor

@azoitl azoitl commented Jun 3, 2024

No description provided.

kumajaya and others added 30 commits May 8, 2024 23:26
In order to prepare the different architectures that the CDevice to be
used on startup can be configured via CMake options in this commit some
clean-ups and generalisations have been performed.
add a base for testing the ctf traces. It has classes representing all possible events being traced, a way of reading the trace files, and a minimal example of comparison of a small FB network.
Add a virtual accessor function for adapters to enable subclasses to
determine the memory location of adapter instances.
Refactor monitoring event counters in preparation for separating dynamic
interface creation from the function block base class.
Move the dynamic interface setup and required variables to the generic function block and make accessor functions pure virtual.
….1 with reset functionality by Franz Hoepfinger.
Updated the copyright notice to reflect 2024 for HR Agrartechnik GmbH in the E_TON_fbt.cpp and E_TON_fbt.h files.
Include a reset feature in Timer Function Blocks for better control and flexibility. This update enhances the existing pulse functionality.
- Renamed timeout-related files with "_adp" suffix
- Updated CMakeLists to include new file names
Changed include paths for timeout classes in event adapter files to match the updated file names. This ensures proper linking and consistency within the codebase.
- Updated source files to include new function block types for timeouts.
- Renamed header and source files for E_TimeOut and E_RTimeOut.
With this change CDevice provides a static method that will create an
isntance of the device to be used by this 4daic FORTE instance.

This reduces code duplication and wrong device creation. Furthermore it
is the basis that different device types can be configured via CMake.
With this commit it is now possible to select the device to be used for
a specific 4diac FORTE build.

As part of this change OPCUA_DEV is currently not build able. Will be
fixed in a seperate commit.
* Choose device based on macro

This change chooses the device based on a macro instead of conditional
compilation. It also works again with OPCUA_DEV.

* Choose device based on configure file and type alias

This change chooses the device based on a configure file with a
type alias instead of a macro.
@azoitl azoitl merged commit 6ed0838 into freeze Jun 3, 2024
9 checks passed
ernstblechaPT added a commit to ernstblechaPT/4diac-forte that referenced this pull request Jun 7, 2024
In eclipse-4diac#131 the memset was removed, this results in random values showing up on the event counters
ernstblechaPT added a commit to ernstblechaPT/4diac-forte that referenced this pull request Jun 7, 2024
In eclipse-4diac#131 the memset was removed, this results in random values showing up on the event counters
azoitl pushed a commit that referenced this pull request Jun 7, 2024
In #131 the memset was removed, this results in random values showing up on the event counters
@azoitl azoitl mentioned this pull request Jun 13, 2024
kaartee added a commit to kaartee/4diac-forte that referenced this pull request Jul 2, 2024
kaartee pushed a commit to kaartee/4diac-forte that referenced this pull request Jul 2, 2024
dok-net added a commit to dok-net/org.eclipse.4diac.forte that referenced this pull request Jul 3, 2024
dok-net added a commit to dok-net/org.eclipse.4diac.forte that referenced this pull request Jul 16, 2024
dok-net added a commit to dok-net/org.eclipse.4diac.forte that referenced this pull request Jul 18, 2024
azoitl pushed a commit that referenced this pull request Jul 18, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

8 participants