fixed: [EEZ Flow] Assignable user property to flow output only works …

…for native user actions #596
eez-open · Oct 17, 2024 · 56556a9 · 56556a9
1 parent f07d4f2
commit 56556a9
Show file tree

Hide file tree

Showing 8 changed files with 13 additions and 8 deletions.
diff --git a/packages/project-editor/flow/runtime/cpp/eez-framework b/packages/project-editor/flow/runtime/cpp/eez-framework
diff --git a/packages/project-editor/flow/runtime/cpp/lvgl-runtime/v8.3/lvgl b/packages/project-editor/flow/runtime/cpp/lvgl-runtime/v8.3/lvgl
diff --git a/packages/project-editor/flow/runtime/eez_runtime.wasm b/packages/project-editor/flow/runtime/eez_runtime.wasm
diff --git a/packages/project-editor/flow/runtime/lvgl_runtime_v8.3.wasm b/packages/project-editor/flow/runtime/lvgl_runtime_v8.3.wasm
diff --git a/packages/project-editor/flow/runtime/lvgl_runtime_v9.0.wasm b/packages/project-editor/flow/runtime/lvgl_runtime_v9.0.wasm
diff --git a/packages/project-editor/lvgl/build.ts b/packages/project-editor/lvgl/build.ts
@@ -290,8 +290,6 @@ export class LVGLBuild extends Build {
             "",
             false
         );
-
-        console.log(this.lvglObjectIdentifiers);
     }
 
     isAccessibleFromSourceCode(widget: LVGLWidget) {

diff --git a/resources/eez-framework-amalgamation/eez-flow.cpp b/resources/eez-framework-amalgamation/eez-flow.cpp
@@ -1,4 +1,4 @@
-/* Autogenerated on October 17, 2024 10:33:39 AM from eez-framework commit b44b5e6a9d48f0b14b8af0ab02537c9c14f4ab95 */
+/* Autogenerated on October 17, 2024 11:48:27 AM from eez-framework commit b44b5e6a9d48f0b14b8af0ab02537c9c14f4ab95 */
 /*
  * eez-framework
  *
@@ -3214,6 +3214,9 @@ void executeCallAction(FlowState *flowState, unsigned componentIndex, int flowIn
                 if (!evalAssignableProperty(flowState, componentIndex, i, value, FlowError::UserProperty("CallAction", i))) {
                     break;
                 }
+                if (value.getType() == VALUE_TYPE_FLOW_OUTPUT) {
+                    value = Value::makePropertyRef(flowState, componentIndex, i, 0x5696e703);
+                }
             } else {
                 if (!evalProperty(flowState, componentIndex, i, value, FlowError::UserAssignableProperty("CallAction", i))) {
                     break;
@@ -10384,8 +10387,12 @@ void assignValue(FlowState *flowState, int componentIndex, Value &dstValue, cons
                 auto propertyRef = pDstValue->getPropertyRef();
                 Value dstValue;
                 if (evalAssignableProperty(propertyRef->flowState, propertyRef->componentIndex, propertyRef->propertyIndex, dstValue, FlowError::Plain("Failed to evaluate an assignable user property in UserWidget"), nullptr, nullptr)) {
-                    assignValue(flowState, componentIndex, dstValue, srcValue);
-                    onValueChanged(pDstValue);
+                    if (dstValue.getType() == VALUE_TYPE_FLOW_OUTPUT) {
+		                propagateValue(propertyRef->flowState, propertyRef->componentIndex, dstValue.getUInt16(), srcValue);
+                    } else {
+	                    assignValue(flowState, componentIndex, dstValue, srcValue);
+                        onValueChanged(pDstValue);
+                    }
                 }
                 return;
             }

diff --git a/resources/eez-framework-amalgamation/eez-flow.h b/resources/eez-framework-amalgamation/eez-flow.h
@@ -1,4 +1,4 @@
-/* Autogenerated on October 17, 2024 10:33:39 AM from eez-framework commit b44b5e6a9d48f0b14b8af0ab02537c9c14f4ab95 */
+/* Autogenerated on October 17, 2024 11:48:27 AM from eez-framework commit b44b5e6a9d48f0b14b8af0ab02537c9c14f4ab95 */
 /*
  * eez-framework
  *
+3 −0		src/eez/flow/components/call_action.cpp
+6 −2		src/eez/flow/private.cpp
-Original file line number
+Diff line change
@@ Expand Up / @@ -290,8 +290,6 @@ export class LVGLBuild extends Build { @@
                 "",
                 false
             );
-            console.log(this.lvglObjectIdentifiers);
         }
         isAccessibleFromSourceCode(widget: LVGLWidget) {
@@ Expand Down @@