Skip to content

Commit e90c853

Browse files
markarenmarkaren
committed
Merge branch 'master' into examples
2 parents baa7680 + 50430cf commit e90c853

6 files changed

Lines changed: 37 additions & 21 deletions

File tree

‎README.md‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,20 @@ the necessary content into a ready-to-use FMU archive.
1616
6. Upload your changes to GitHub to trigger cross-compilation.
1717
7. Download cross-compiled FMUs from the Actions tab.
1818

19+
#### Alternate workflow using CMake FetchContent
20+
You can also use FMU4cpp as a CMake FetchContent dependency in a pre-existing CMake project.
21+
22+
```cmake
23+
include(FetchContent)
24+
FetchContent_Declare(
25+
fmu4cpp
26+
GIT_REPOSITORY https://github.com/Ecos-platform/fmu4cpp.git
27+
GIT_TAG git_tag_commit_or_branch_to_use
28+
)
29+
FetchContent_MakeAvailable(fmu4cpp)
30+
```
31+
32+
Then, you can create your own FMU by inheriting from `fmu4cpp::fmu_base` and using the `generate_fmu` function.
1933

2034
### Example (BouncingBall)
2135

‎cmake/generate_fmu.cmake‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,8 @@ function(generateFMU modelIdentifier)
4242

4343
foreach (fmiVersion IN LISTS FMU_FMI_VERSIONS)
4444

45+
_getTargetPlatform(${fmiVersion})
46+
4547
set(fmuOutputDir "${fmuResultDir}/${fmiVersion}")
4648
set(modelOutputDir "${fmuOutputDir}/${modelIdentifier}")
4749
set(binaryOutputDir "$<1:${modelOutputDir}/binaries/${TARGET_PLATFORM}>")
@@ -56,8 +58,6 @@ function(generateFMU modelIdentifier)
5658
@ONLY
5759
)
5860

59-
_getTargetPlatform(${fmiVersion})
60-
6161
set(VERSIONS_DEFS "")
6262
if (fmiVersion STREQUAL "fmi2")
6363
list(APPEND VERSION_DEFS "FMI2")
@@ -67,6 +67,8 @@ function(generateFMU modelIdentifier)
6767
list(APPEND VERSION_DEFS "FMI3")
6868
target_compile_definitions(fmu4cpp_fmi3 PUBLIC "FMI3")
6969
list(APPEND VERSION_OBJECTS "$<TARGET_OBJECTS:fmu4cpp_fmi3>")
70+
else ()
71+
message(FATAL_ERROR "Unknown FMI version: ${fmiVersion}. Supported versions are 'fmi2' and 'fmi3'.")
7072
endif ()
7173

7274
add_library(${versionTarget} SHARED

‎export/include/fmu4cpp/fmu_base.hpp‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -247,27 +247,27 @@ namespace fmu4cpp {
247247
virtual ~fmu_base() = default;
248248

249249
protected:
250-
IntVariable integer(const std::string &name, int *ptr, const std::function<void(int)> &onChange = {});
250+
IntVariable integer(const std::string &name, int *ptr, const std::function<void()> &onChange = {});
251251
IntVariable integer(const std::string &name,
252252
const std::function<int()> &getter,
253253
const std::optional<std::function<void(int)>> &setter = std::nullopt);
254254

255-
RealVariable real(const std::string &name, double *ptr, const std::function<void(double)> &onChange = {});
255+
RealVariable real(const std::string &name, double *ptr, const std::function<void()> &onChange = {});
256256
RealVariable real(const std::string &name,
257257
const std::function<double()> &getter,
258258
const std::optional<std::function<void(double)>> &setter = std::nullopt);
259259

260-
BoolVariable boolean(const std::string &name, bool *ptr, const std::function<void(bool)> &onChange = {});
260+
BoolVariable boolean(const std::string &name, bool *ptr, const std::function<void()> &onChange = {});
261261
BoolVariable boolean(const std::string &name,
262262
const std::function<bool()> &getter,
263263
const std::optional<std::function<void(bool)>> &setter);
264264

265-
StringVariable string(const std::string &name, std::string *ptr, const std::function<void(std::string)> &onChange = {});
265+
StringVariable string(const std::string &name, std::string *ptr, const std::function<void()> &onChange = {});
266266
StringVariable string(const std::string &name,
267267
const std::function<std::string()> &getter,
268268
const std::optional<std::function<void(std::string)>> &setter = std::nullopt);
269269

270-
BinaryVariable binary(const std::string &name, std::string *ptr, const std::function<void(std::string)> &onChange = {});
270+
BinaryVariable binary(const std::string &name, std::string *ptr, const std::function<void()> &onChange = {});
271271
BinaryVariable binary(const std::string &name,
272272
const std::function<std::string()> &getter,
273273
const std::optional<std::function<void(std::string)>> &setter = std::nullopt);

‎export/include/fmu4cpp/fmu_variable.hpp‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,7 @@ namespace fmu4cpp {
103103
public:
104104
Variable(
105105
const std::string &name,
106-
unsigned int vr, size_t index, T *ptr, const std::function<void(T)> &onChange)
106+
unsigned int vr, size_t index, T *ptr, const std::function<void()> &onChange)
107107
: VariableBase(name, vr, index), access_(std::make_unique<PtrAccess<T>>(ptr, onChange)) {}
108108

109109
Variable(
@@ -170,7 +170,7 @@ namespace fmu4cpp {
170170
public:
171171
IntVariable(
172172
const std::string &name,
173-
unsigned int vr, size_t index, int *ptr, const std::function<void(int)> &onChange)
173+
unsigned int vr, size_t index, int *ptr, const std::function<void()> &onChange)
174174
: Variable(name, vr, index, ptr, onChange) {}
175175

176176
IntVariable(
@@ -208,7 +208,7 @@ namespace fmu4cpp {
208208
public:
209209
RealVariable(
210210
const std::string &name,
211-
unsigned int vr, size_t index, double *ptr, const std::function<void(double)> &onChange)
211+
unsigned int vr, size_t index, double *ptr, const std::function<void()> &onChange)
212212
: Variable(name, vr, index, ptr, onChange) {
213213

214214
variability_ = variability_t::CONTINUOUS;
@@ -252,7 +252,7 @@ namespace fmu4cpp {
252252
public:
253253
BoolVariable(
254254
const std::string &name,
255-
unsigned int vr, size_t index, bool *ptr, const std::function<void(bool)> &onChange)
255+
unsigned int vr, size_t index, bool *ptr, const std::function<void()> &onChange)
256256
: Variable(name, vr, index, ptr, onChange) {}
257257

258258
BoolVariable(
@@ -268,7 +268,7 @@ namespace fmu4cpp {
268268
public:
269269
StringVariable(
270270
const std::string &name,
271-
unsigned int vr, size_t index, std::string *ptr, const std::function<void(std::string)> &onChange)
271+
unsigned int vr, size_t index, std::string *ptr, const std::function<void()> &onChange)
272272
: Variable(name, vr, index, ptr, onChange) {}
273273

274274
StringVariable(
@@ -284,7 +284,7 @@ namespace fmu4cpp {
284284
public:
285285
BinaryVariable(
286286
const std::string &name,
287-
unsigned int vr, size_t index, std::string *ptr, const std::function<void(std::string)> &onChange)
287+
unsigned int vr, size_t index, std::string *ptr, const std::function<void()> &onChange)
288288
: Variable(name, vr, index, ptr, onChange) {}
289289

290290
BinaryVariable(

‎export/include/fmu4cpp/variable_access.hpp‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ namespace fmu4cpp {
2020
class PtrAccess final : public VariableAccess<T> {
2121

2222
public:
23-
explicit PtrAccess(T *ptr, const std::function<void(T)>& onChange)
23+
explicit PtrAccess(T *ptr, const std::function<void()>& onChange)
2424
: ptr_(ptr), onChange_(onChange) {}
2525

2626
T get() override {
@@ -29,12 +29,12 @@ namespace fmu4cpp {
2929

3030
void set(T value) override {
3131
*ptr_ = value;
32-
if (onChange_) onChange_(value);
32+
if (onChange_) onChange_();
3333
}
3434

3535
private:
3636
T *ptr_;
37-
std::function<void(T)> onChange_;
37+
std::function<void()> onChange_;
3838
};
3939

4040
template<typename T>

‎export/src/fmu4cpp/fmu_base.cpp‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ namespace fmu4cpp {
2828
throw fatal_error("Reset is unimplemented in slave");
2929
}
3030

31-
IntVariable fmu_base::integer(const std::string &name, int *ptr, const std::function<void(int)> &onChange) {
31+
IntVariable fmu_base::integer(const std::string &name, int *ptr, const std::function<void()> &onChange) {
3232
const auto vr = static_cast<unsigned int>(numVariables_++);
3333
return {name, vr, numVariables_, ptr, onChange};
3434
}
@@ -38,7 +38,7 @@ namespace fmu4cpp {
3838
return {name, vr, numVariables_, getter, setter};
3939
}
4040

41-
RealVariable fmu_base::real(const std::string &name, double *ptr, const std::function<void(double)> &onChange) {
41+
RealVariable fmu_base::real(const std::string &name, double *ptr, const std::function<void()> &onChange) {
4242
const auto vr = static_cast<unsigned int>(numVariables_++);
4343
return {name, vr, numVariables_, ptr, onChange};
4444
}
@@ -48,7 +48,7 @@ namespace fmu4cpp {
4848
return {name, vr, numVariables_, getter, setter};
4949
}
5050

51-
BoolVariable fmu_base::boolean(const std::string &name, bool *ptr, const std::function<void(bool)> &onChange) {
51+
BoolVariable fmu_base::boolean(const std::string &name, bool *ptr, const std::function<void()> &onChange) {
5252
const auto vr = static_cast<unsigned int>(numVariables_++);
5353
return {name, vr, numVariables_, ptr, onChange};
5454
}
@@ -58,7 +58,7 @@ namespace fmu4cpp {
5858
return {name, vr, numVariables_, getter, setter};
5959
}
6060

61-
StringVariable fmu_base::string(const std::string &name, std::string *ptr, const std::function<void(std::string)> &onChange) {
61+
StringVariable fmu_base::string(const std::string &name, std::string *ptr, const std::function<void()> &onChange) {
6262
const auto vr = static_cast<unsigned int>(numVariables_++);
6363
return {name, vr, numVariables_, ptr, onChange};
6464
}
@@ -68,7 +68,7 @@ namespace fmu4cpp {
6868
return {name, vr, numVariables_, getter, setter};
6969
}
7070

71-
BinaryVariable fmu_base::binary(const std::string &name, std::string *ptr, const std::function<void(std::string)> &onChange) {
71+
BinaryVariable fmu_base::binary(const std::string &name, std::string *ptr, const std::function<void()> &onChange) {
7272
const auto vr = static_cast<unsigned int>(numVariables_++);
7373
return {name, vr, numVariables_, ptr, onChange};
7474
}

0 commit comments

Comments
 (0)