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

Kel/fmi3 all types buffers #424

Merged
merged 64 commits into from
Jul 16, 2024
Merged

Kel/fmi3 all types buffers #424

merged 64 commits into from
Jul 16, 2024

Conversation

lausdahl
Copy link
Contributor

No description provided.

lausdahl and others added 30 commits December 1, 2022 13:06
Signed-off-by: Nestor <nikolajkjakobsen@gmail.com>
Signed-off-by: Nestor <nikolajkjakobsen@gmail.com>
Signed-off-by: Nestor <nikolajkjakobsen@gmail.com>
Signed-off-by: Nestor <nikolajkjakobsen@gmail.com>
Signed-off-by: Nestor <nikolajkjakobsen@gmail.com>
# Conflicts:
#	frameworks/builder/src/main/java/org/intocps/maestro/framework/fmi2/api/FmiBuilder.java
#	frameworks/fmi2api/src/main/java/org/intocps/maestro/framework/fmi2/api/mabl/values/PortValueExpresssionMapImpl.java
#	frameworks/fmi2api/src/main/java/org/intocps/maestro/framework/fmi2/api/mabl/values/PortValueMapImpl.java
#	frameworks/fmi2api/src/main/java/org/intocps/maestro/framework/fmi2/api/mabl/variables/FmuVariableFmi3Api.java
#	frameworks/fmi2api/src/main/java/org/intocps/maestro/framework/fmi2/api/mabl/variables/InstanceVariableFmi3Api.java
#	frameworks/fmi2api/src/main/java/org/intocps/maestro/framework/fmi2/api/mabl/variables/PortVariableMapImpl.java
#	frameworks/fmi2api/src/main/java/org/intocps/maestro/framework/fmi2/api/mabl/variables/StateMablVariableFmi3Api.java
#	maestro/src/test/java/org/intocps/maestro/BuilderFmi3Test.java
lausdahl and others added 28 commits November 9, 2023 22:47
# Conflicts:
#	.github/workflows/maven.yml
#	maestro/src/main/java/org/intocps/maestro/cli/ImportCmd.java
#	maestro/src/test/java/org/intocps/maestro/FullSpecTest.java
#	pom.xml
…th specific fmi3 types to retain consistency
@lausdahl lausdahl merged commit dec864d into development Jul 16, 2024
8 checks passed
@lausdahl lausdahl deleted the kel/fmi3-all-types-buffers branch July 16, 2024 15:26
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.

3 participants