diff --git a/installation/make-electron-builder-yml.ts b/installation/make-electron-builder-yml.ts index c670e1ff..29c88a80 100644 --- a/installation/make-electron-builder-yml.ts +++ b/installation/make-electron-builder-yml.ts @@ -61,6 +61,7 @@ let files = [ "!**/node_modules/*.d.ts", "!**/node_modules/.bin", "!**/*.js.map", + "!**/*.mjs.map", "!**/*.css.map", "!**/*.ilk", "!**/*.lib", diff --git a/packages/eez-studio-ui/_stylesheets/project-editor.less b/packages/eez-studio-ui/_stylesheets/project-editor.less index d1a334b8..d7171b97 100644 --- a/packages/eez-studio-ui/_stylesheets/project-editor.less +++ b/packages/eez-studio-ui/_stylesheets/project-editor.less @@ -96,10 +96,11 @@ } .EezStudio_ProjectEditor_ToolbarNav_FlowRuntimeControls { + display: flex; @media (min-width: 1600px) { width: 0; } - justify-content: "flex-end"; + justify-content: flex-end; } } } diff --git a/packages/instrument/bb3/conf.ts b/packages/instrument/bb3/conf.ts index f9a2f9d3..69913bc0 100644 --- a/packages/instrument/bb3/conf.ts +++ b/packages/instrument/bb3/conf.ts @@ -11,7 +11,7 @@ export const FIRMWARE_RELEASES_PAGE = "https://github.com/eez-open/modular-psu-firmware/releases"; export const FIRMWARE_UPGRADE_PAGE = - "https://www.envox.hr/eez/eez-bench-box-3/bb3-user-manual/13-firmware-upgrade.html"; + "https://www.envox.eu/eez-bench-box-3/bb3-user-manual/13-firmware-upgrade/"; export const SCRIPTS_CATALOG_URL = "https://github.com/eez-open/modular-psu-firmware/raw/master/scripts/scripts-catalog.json"; diff --git a/packages/project-editor/flow/debugger/WatchPanel.tsx b/packages/project-editor/flow/debugger/WatchPanel.tsx index 15713513..00bb0893 100644 --- a/packages/project-editor/flow/debugger/WatchPanel.tsx +++ b/packages/project-editor/flow/debugger/WatchPanel.tsx @@ -312,7 +312,9 @@ const WatchTable = observer( ); if (objectVariableType) { - value = objectVariableType.getValue(value); + value = objectVariableType.getValue + ? objectVariableType.getValue(value) + : undefined; const getChildren = ( value: any, diff --git a/packages/project-editor/flow/runtime/cpp/eez-framework b/packages/project-editor/flow/runtime/cpp/eez-framework index 129db029..83b926fb 160000 --- a/packages/project-editor/flow/runtime/cpp/eez-framework +++ b/packages/project-editor/flow/runtime/cpp/eez-framework @@ -1 +1 @@ -Subproject commit 129db029d6fc4fdd1086fc8f836d72feed469d54 +Subproject commit 83b926fbd2f39af0eb6460b1cc38e289a5dd6432 diff --git a/packages/project-editor/flow/runtime/eez_runtime.wasm b/packages/project-editor/flow/runtime/eez_runtime.wasm index 74f01eb4..e1c7d0fc 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 d4d68935..37faa288 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 8e2a4046..ec2bc526 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/flow/runtime/wasm-runtime.tsx b/packages/project-editor/flow/runtime/wasm-runtime.tsx index 04a06674..16a9e3a6 100644 --- a/packages/project-editor/flow/runtime/wasm-runtime.tsx +++ b/packages/project-editor/flow/runtime/wasm-runtime.tsx @@ -363,9 +363,9 @@ export class WasmRuntime extends RemoteRuntime { arrayValue.valueType ); if (objectVariableType) { - const objectValue = objectVariableType.getValue( - arrayValue.value - ); + const objectValue = objectVariableType.getValue + ? objectVariableType.getValue(arrayValue.value) + : undefined; if (objectValue) { result = objectVariableType.valueFieldDescriptions[ @@ -505,9 +505,11 @@ export class WasmRuntime extends RemoteRuntime { valueType ); if (objectVariableType) { - let value = objectVariableType.getValue( - workerToRenderMessage.freeArrayValue.value - ); + let value = objectVariableType.getValue + ? objectVariableType.getValue( + workerToRenderMessage.freeArrayValue.value + ) + : undefined; if (value) { objectVariableType.destroyValue(value); } @@ -869,10 +871,11 @@ export class WasmRuntime extends RemoteRuntime { ); if (typeof engineValueWithType.value == "object") { - let objectValue = - globalVariable.objectVariableType.getValue( - engineValueWithType.value - ); + let objectValue = globalVariable.objectVariableType.getValue + ? globalVariable.objectVariableType.getValue( + engineValueWithType.value + ) + : undefined; if (objectValue) { globalVariable.objectVariableType.destroyValue( objectValue diff --git a/packages/project-editor/project/ui/Toolbar.tsx b/packages/project-editor/project/ui/Toolbar.tsx index ff993b71..5bcc9137 100644 --- a/packages/project-editor/project/ui/Toolbar.tsx +++ b/packages/project-editor/project/ui/Toolbar.tsx @@ -56,8 +56,9 @@ export const Toolbar = observer( this.context.dataContext.get(variable.fullName); if (objectVariableValue) { - const managedValue = - objectVariableType.getValue(objectVariableValue); + const managedValue = objectVariableType.getValue + ? objectVariableType.getValue(objectVariableValue) + : undefined; if (managedValue) { objectVariableValue = managedValue; } diff --git a/resources/eez-framework-amalgamation/eez-flow.cpp b/resources/eez-framework-amalgamation/eez-flow.cpp index 45bff320..0f5fc37f 100644 --- a/resources/eez-framework-amalgamation/eez-flow.cpp +++ b/resources/eez-framework-amalgamation/eez-flow.cpp @@ -1,4 +1,4 @@ -/* Autogenerated on November 1, 2024 12:14:45 PM from eez-framework commit 2273db7f97347325b2f167c07e538de90c6b93d0 */ +/* Autogenerated on November 7, 2024 10:25:35 AM from eez-framework commit 129db029d6fc4fdd1086fc8f836d72feed469d54 */ /* * eez-framework * @@ -3207,7 +3207,7 @@ void executeCallAction(FlowState *flowState, unsigned componentIndex, int flowIn FlowState *actionFlowState = initActionFlowState(flowIndex, flowState, componentIndex, inputValue); if ((int)componentIndex != -1) { auto component = flowState->flow->components[componentIndex]; - for (uint32_t i = 0; i < component->properties.count; i++) { + for (uint32_t i = 0; i < actionFlowState->flow->userPropertiesAssignable.count; i++) { auto isAssignable = actionFlowState->flow->userPropertiesAssignable.items[i]; Value value; if (isAssignable) { @@ -10520,7 +10520,9 @@ void throwError(FlowState *flowState, int componentIndex, const char *errorMessa ) ) { for (FlowState *fs = flowState; fs != catchErrorFlowState; fs = fs->parentFlowState) { - fs->error = true; + if (fs->isAction) { + fs->error = true; + } } auto component = catchErrorFlowState->flow->components[catchErrorComponentIndex]; if (component->type == defs_v3::COMPONENT_TYPE_CATCH_ERROR_ACTION) { diff --git a/resources/eez-framework-amalgamation/eez-flow.h b/resources/eez-framework-amalgamation/eez-flow.h index 6f7271bd..fd0c4248 100644 --- a/resources/eez-framework-amalgamation/eez-flow.h +++ b/resources/eez-framework-amalgamation/eez-flow.h @@ -1,4 +1,4 @@ -/* Autogenerated on November 1, 2024 12:14:45 PM from eez-framework commit 2273db7f97347325b2f167c07e538de90c6b93d0 */ +/* Autogenerated on November 7, 2024 10:25:35 AM from eez-framework commit 129db029d6fc4fdd1086fc8f836d72feed469d54 */ /* * eez-framework *