Fix marshalling from FMU to MCL to include FMI local variables.

Signed-off-by: Timothy Rule (VM/EMT3) <[email protected]>
boschglobal · Dec 17, 2024 · 5b1dc66 · 5b1dc66
1 parent f346951
commit 5b1dc66
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 2 deletions.
diff --git a/dse/fmimcl/adapter/fmi2mcl.c b/dse/fmimcl/adapter/fmi2mcl.c
@@ -188,7 +188,14 @@ static int32_t fmi2mcl_marshal_in(FmuModel* m)
 
     log_trace("Marshal IN (FMU -> target):");
     for (MarshalGroup* mg = m->data.mg_table; mg && mg->name; mg++) {
-        if (mg->dir != MARSHAL_DIRECTION_RXONLY) continue;
+        switch (mg->dir) {
+        case MARSHAL_DIRECTION_TXRX:
+        case MARSHAL_DIRECTION_RXONLY:
+        case MARSHAL_DIRECTION_LOCAL:
+            break;
+        default:
+            continue;
+        }
 
         log_trace(
             "  (name: %s, count: %d, type: %d)", mg->name, mg->count, mg->type);
@@ -284,7 +291,14 @@ int32_t fmi2mcl_marshal_out(FmuModel* m)
 
     log_trace("Marshal OUT (target -> FMU):");
     for (MarshalGroup* mg = m->data.mg_table; mg && mg->name; mg++) {
-        if (mg->dir != MARSHAL_DIRECTION_TXONLY) continue;
+        switch (mg->dir) {
+        case MARSHAL_DIRECTION_TXRX:
+        case MARSHAL_DIRECTION_TXONLY:
+        case MARSHAL_DIRECTION_PARAMETER:
+            break;
+        default:
+            continue;
+        }
 
         log_trace(
             "  (name: %s, count: %d, type: %d)", mg->name, mg->count, mg->type);

diff --git a/dse/fmimcl/examples/input/data/simulation.yaml b/dse/fmimcl/examples/input/data/simulation.yaml
@@ -166,6 +166,12 @@ spec:
         fmi_variable_name: real_A2_rx
         fmi_variable_type: Real
         fmi_variable_causality: output
+    - signal: local_var
+      annotations:
+        fmi_variable_vref: 12
+        fmi_variable_name: local_var
+        fmi_variable_type: Real
+        fmi_variable_causality: local
 ---
 kind: SignalGroup
 metadata: