Skip to content

Commit

Permalink
update eez-framework
Browse files Browse the repository at this point in the history
  • Loading branch information
mvladic committed Nov 7, 2024
1 parent 2567184 commit c1d5504
Show file tree
Hide file tree
Showing 12 changed files with 30 additions and 20 deletions.
1 change: 1 addition & 0 deletions installation/make-electron-builder-yml.ts
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,7 @@ let files = [
"!**/node_modules/*.d.ts",
"!**/node_modules/.bin",
"!**/*.js.map",
"!**/*.mjs.map",
"!**/*.css.map",
"!**/*.ilk",
"!**/*.lib",
Expand Down
3 changes: 2 additions & 1 deletion packages/eez-studio-ui/_stylesheets/project-editor.less
Original file line number Diff line number Diff line change
Expand Up @@ -96,10 +96,11 @@
}

.EezStudio_ProjectEditor_ToolbarNav_FlowRuntimeControls {
display: flex;
@media (min-width: 1600px) {
width: 0;
}
justify-content: "flex-end";
justify-content: flex-end;
}
}
}
Expand Down
2 changes: 1 addition & 1 deletion packages/instrument/bb3/conf.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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";
Expand Down
4 changes: 3 additions & 1 deletion packages/project-editor/flow/debugger/WatchPanel.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -312,7 +312,9 @@ const WatchTable = observer(
);

if (objectVariableType) {
value = objectVariableType.getValue(value);
value = objectVariableType.getValue
? objectVariableType.getValue(value)
: undefined;

const getChildren = (
value: any,
Expand Down
Binary file modified packages/project-editor/flow/runtime/eez_runtime.wasm
Binary file not shown.
Binary file modified packages/project-editor/flow/runtime/lvgl_runtime_v8.3.wasm
Binary file not shown.
Binary file modified packages/project-editor/flow/runtime/lvgl_runtime_v9.0.wasm
Binary file not shown.
23 changes: 13 additions & 10 deletions packages/project-editor/flow/runtime/wasm-runtime.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -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[
Expand Down Expand Up @@ -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);
}
Expand Down Expand Up @@ -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
Expand Down
5 changes: 3 additions & 2 deletions packages/project-editor/project/ui/Toolbar.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
Expand Down
8 changes: 5 additions & 3 deletions resources/eez-framework-amalgamation/eez-flow.cpp
Original file line number Diff line number Diff line change
@@ -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
*
Expand Down Expand Up @@ -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) {
Expand Down Expand Up @@ -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) {
Expand Down
2 changes: 1 addition & 1 deletion resources/eez-framework-amalgamation/eez-flow.h
Original file line number Diff line number Diff line change
@@ -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
*
Expand Down

0 comments on commit c1d5504

Please sign in to comment.