diff --git a/packages/project-editor/flow/runtime/cpp/eez-framework b/packages/project-editor/flow/runtime/cpp/eez-framework index b44b5e6a..a2986ecc 160000 --- a/packages/project-editor/flow/runtime/cpp/eez-framework +++ b/packages/project-editor/flow/runtime/cpp/eez-framework @@ -1 +1 @@ -Subproject commit b44b5e6a9d48f0b14b8af0ab02537c9c14f4ab95 +Subproject commit a2986ecc8ed4605a49ed9224c6817a5c6a4d8295 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 index b55aad64..acc30061 160000 --- a/packages/project-editor/flow/runtime/cpp/lvgl-runtime/v8.3/lvgl +++ b/packages/project-editor/flow/runtime/cpp/lvgl-runtime/v8.3/lvgl @@ -1 +1 @@ -Subproject commit b55aad64f04867f86286651048577436e4073506 +Subproject commit acc30061f77852d3f78c35e0a537f93055c8024c diff --git a/packages/project-editor/flow/runtime/eez_runtime.wasm b/packages/project-editor/flow/runtime/eez_runtime.wasm index 0c213f2a..74f01eb4 100644 Binary files a/packages/project-editor/flow/runtime/eez_runtime.wasm and b/packages/project-editor/flow/runtime/eez_runtime.wasm differ diff --git a/packages/project-editor/flow/runtime/lvgl_runtime_v8.3.wasm b/packages/project-editor/flow/runtime/lvgl_runtime_v8.3.wasm index c0cb54c9..007b6fa6 100644 Binary files a/packages/project-editor/flow/runtime/lvgl_runtime_v8.3.wasm and b/packages/project-editor/flow/runtime/lvgl_runtime_v8.3.wasm differ diff --git a/packages/project-editor/flow/runtime/lvgl_runtime_v9.0.wasm b/packages/project-editor/flow/runtime/lvgl_runtime_v9.0.wasm index ec43dbdd..c0a61c20 100644 Binary files a/packages/project-editor/flow/runtime/lvgl_runtime_v9.0.wasm and b/packages/project-editor/flow/runtime/lvgl_runtime_v9.0.wasm differ diff --git a/packages/project-editor/lvgl/build.ts b/packages/project-editor/lvgl/build.ts index 388f652c..d1b0a0ee 100644 --- 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 index bd830541..27ce8442 100644 --- 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 index 34ceba3d..c3073f8b 100644 --- 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 *